fx/ingestor currencies map fixed

2025-12-12 11:05:12 +01:00
parent 681d53e856
commit 17333df7af
26 changed files with 86 additions and 92 deletions
--- a/api/fx/ingestor/go.mod
+++ b/api/fx/ingestor/go.mod
@@ -51,5 +51,5 @@ require (
 	golang.org/x/text v0.32.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	google.golang.org/grpc v1.77.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 )
--- a/api/fx/ingestor/go.sum
+++ b/api/fx/ingestor/go.sum
@@ -216,8 +216,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/api/fx/ingestor/internal/market/cbr/connector.go
+++ b/api/fx/ingestor/internal/market/cbr/connector.go
@@ -214,16 +214,13 @@ func (c *cbrConnector) refreshDirectory() error {

 	var directory valuteDirectory
 	if err := decoder.Decode(&directory); err != nil {
-		c.logger.Warn(
-			"CBR directory decode failed",
-			zap.Error(err),
-			zap.String("endpoint", endpoint),
-		)
+		c.logger.Warn("CBR directory decode failed", zap.Error(err), zap.String("endpoint", endpoint))
 		return merrors.InternalWrap(err, "cbr: decode directory")
 	}

-	mapping, err := buildValuteMapping(directory.Items)
+	mapping, err := buildValuteMapping(c.logger.Named("mapper"), directory.Items)
 	if err != nil {
+		c.logger.Warn("Failed to build currencies mapping", zap.Error(err), zap.String("endpoint", endpoint))
 		return err
 	}

@@ -235,23 +232,22 @@ func (c *cbrConnector) refreshDirectory() error {
 func (c *cbrConnector) fetchDailyRate(ctx context.Context, valute valuteInfo) (string, error) {
 	endpoint, err := c.buildURL(c.dailyPath, nil)
 	if err != nil {
+		c.logger.Warn("Failed to build daily fetch URL", zap.Error(err), zap.String("path", c.dailyPath))
 		return "", err
 	}

 	req, err := c.http.NewRequest(ctx, http.MethodGet, endpoint)
 	if err != nil {
+		c.logger.Warn("Failed to request daily rate", zap.Error(err), zap.String("endpoint", endpoint))
 		return "", merrors.InternalWrap(err, "cbr: build daily request")
 	}

 	resp, err := c.http.Do(req)
 	if err != nil {
-		c.logger.Warn(
-			"CBR daily request failed",
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("endpoint", endpoint),
-			zap.String("referer", c.http.headerValue("Referer")),
+		c.logger.Warn("CBR daily request failed",
+			zap.Error(err), zap.String("currency", valute.ISOCharCode),
+			zap.String("endpoint", endpoint), zap.String("referer", c.http.headerValue("Referer")),
 			zap.String("user_agent", c.http.headerValue("User-Agent")),
-			zap.Error(err),
 		)
 		return "", merrors.InternalWrap(err, "cbr: daily request failed")
 	}
@@ -259,10 +255,8 @@ func (c *cbrConnector) fetchDailyRate(ctx context.Context, valute valuteInfo) (s

 	if resp.StatusCode != http.StatusOK {
 		c.logger.Warn(
-			"CBR daily returned non-OK status",
-			zap.Int("status", resp.StatusCode),
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("endpoint", endpoint),
+			"CBR daily returned non-OK status", zap.Int("status", resp.StatusCode),
+			zap.String("currency", valute.ISOCharCode), zap.String("endpoint", endpoint),
 		)
 		return "", merrors.Internal("cbr: unexpected status " + strconv.Itoa(resp.StatusCode))
 	}
@@ -272,11 +266,8 @@ func (c *cbrConnector) fetchDailyRate(ctx context.Context, valute valuteInfo) (s

 	var payload dailyRates
 	if err := decoder.Decode(&payload); err != nil {
-		c.logger.Warn(
-			"CBR daily decode failed",
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("endpoint", endpoint),
-			zap.Error(err),
+		c.logger.Warn("CBR daily decode failed", zap.Error(err),
+			zap.String("currency", valute.ISOCharCode), zap.String("endpoint", endpoint),
 		)
 		return "", merrors.InternalWrap(err, "cbr: decode daily response")
 	}
@@ -410,7 +401,7 @@ type valuteMapping struct {
 	byID  map[string]valuteInfo
 }

-func buildValuteMapping(items []valuteItem) (*valuteMapping, error) {
+func buildValuteMapping(logger *zap.Logger, items []valuteItem) (*valuteMapping, error) {
 	byISO := make(map[string]valuteInfo, len(items))
 	byID := make(map[string]valuteInfo, len(items))
 	byNum := make(map[string]string, len(items))
@@ -425,34 +416,35 @@ func buildValuteMapping(items []valuteItem) (*valuteMapping, error) {
 		if err != nil {
 			return nil, merrors.InvalidDataType("cbr: parse directory nominal: " + err.Error())
 		}
-		if id == "" || isoChar == "" {
-			return nil, merrors.InvalidDataType("cbr: directory contains entry with empty id or iso code")
-		}
-
-		info := valuteInfo{
-			ID:          id,
-			ISOCharCode: isoChar,
-			ISONumCode:  isoNum,
-			Name:        name,
-			EngName:     engName,
-			Nominal:     nominal,
-		}
-
-		if existing, ok := byISO[isoChar]; ok && existing.ID != id {
-			return nil, merrors.InvalidDataType("cbr: duplicate ISO code " + isoChar)
-		}
-		if existing, ok := byID[id]; ok && existing.ISOCharCode != isoChar {
-			return nil, merrors.InvalidDataType("cbr: duplicate valute id " + id)
-		}
-		if isoNum != "" {
-			if existingID, ok := byNum[isoNum]; ok && existingID != id {
-				return nil, merrors.InvalidDataType("cbr: duplicate ISO numeric code " + isoNum)
+		if id != "" && isoChar != "" {
+			info := valuteInfo{
+				ID:          id,
+				ISOCharCode: isoChar,
+				ISONumCode:  isoNum,
+				Name:        name,
+				EngName:     engName,
+				Nominal:     nominal,
 			}
-			byNum[isoNum] = id
-		}

-		byISO[isoChar] = info
-		byID[id] = info
+			if existing, ok := byISO[isoChar]; ok && existing.ID != id {
+				return nil, merrors.InvalidDataType("cbr: duplicate ISO code " + isoChar)
+			}
+			if existing, ok := byID[id]; ok && existing.ISOCharCode != isoChar {
+				return nil, merrors.InvalidDataType("cbr: duplicate valute id " + id)
+			}
+			if isoNum != "" {
+				if existingID, ok := byNum[isoNum]; ok && existingID != id {
+					return nil, merrors.InvalidDataType("cbr: duplicate ISO numeric code " + isoNum)
+				}
+				byNum[isoNum] = id
+			}
+
+			logger.Info("Installing currency code", zap.String("iso_code", isoChar), zap.String("id", id))
+			byISO[isoChar] = info
+			byID[id] = info
+		} else {
+			logger.Info("Skipping invalid currency entry", zap.String("id", id), zap.String("iso_char", isoChar))
+		}
 	}

 	if len(byISO) == 0 {
--- a/api/fx/oracle/go.mod
+++ b/api/fx/oracle/go.mod
@@ -14,7 +14,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.10
+	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1
 )

--- a/api/fx/oracle/go.sum
+++ b/api/fx/oracle/go.sum
@@ -216,8 +216,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/api/fx/storage/go.mod
+++ b/api/fx/storage/go.mod
@@ -28,5 +28,5 @@ require (
 	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 )
--- a/api/fx/storage/go.sum
+++ b/api/fx/storage/go.sum
@@ -169,7 +169,7 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=