neq quotation definition + priced_at field

2026-02-13 15:35:17 +01:00
parent da1636014b
commit 52c4c046c9
85 changed files with 1180 additions and 162 deletions
--- a/api/payments/orchestrator/go.mod
+++ b/api/payments/orchestrator/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/tech/sendico/pkg v0.1.0
 	go.mongodb.org/mongo-driver/v2 v2.5.0
 	go.uber.org/zap v1.27.1
-	google.golang.org/grpc v1.79.0
+	google.golang.org/grpc v1.79.1
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1
 )
--- a/api/payments/orchestrator/go.sum
+++ b/api/payments/orchestrator/go.sum
@@ -213,8 +213,8 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 h1:mWPCjDEyshlQYzBpMNHaEof6UX1PmHcaUODUywQ0uac=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
-google.golang.org/grpc v1.79.0 h1:6/+EFlxsMyoSbHbBoEDx94n/Ycx/bi0IhJ5Qh7b7LaA=
-google.golang.org/grpc v1.79.0/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
+google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY=
+google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
 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=
--- a/api/payments/orchestrator/internal/service/orchestrator/convert.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/convert.go
@@ -685,6 +685,10 @@ func fxQuoteFromProto(quote *oraclev1.Quote) *paymenttypes.FXQuote {
 	if quote == nil {
 		return nil
 	}
+	pricedAtUnixMs := int64(0)
+	if ts := quote.GetPricedAt(); ts != nil {
+		pricedAtUnixMs = ts.AsTime().UnixMilli()
+	}
 	return &paymenttypes.FXQuote{
 		QuoteRef:        strings.TrimSpace(quote.GetQuoteRef()),
 		Pair:            pairFromProto(quote.GetPair()),
@@ -693,6 +697,7 @@ func fxQuoteFromProto(quote *oraclev1.Quote) *paymenttypes.FXQuote {
 		BaseAmount:      moneyFromProto(quote.GetBaseAmount()),
 		QuoteAmount:     moneyFromProto(quote.GetQuoteAmount()),
 		ExpiresAtUnixMs: quote.GetExpiresAtUnixMs(),
+		PricedAtUnixMs:  pricedAtUnixMs,
 		Provider:        strings.TrimSpace(quote.GetProvider()),
 		RateRef:         strings.TrimSpace(quote.GetRateRef()),
 		Firm:            quote.GetFirm(),
@@ -703,6 +708,10 @@ func fxQuoteToProto(quote *paymenttypes.FXQuote) *oraclev1.Quote {
 	if quote == nil {
 		return nil
 	}
+	var pricedAt *timestamppb.Timestamp
+	if quote.PricedAtUnixMs > 0 {
+		pricedAt = timestamppb.New(time.UnixMilli(quote.PricedAtUnixMs).UTC())
+	}
 	return &oraclev1.Quote{
 		QuoteRef:        strings.TrimSpace(quote.QuoteRef),
 		Pair:            pairToProto(quote.Pair),
@@ -711,6 +720,7 @@ func fxQuoteToProto(quote *paymenttypes.FXQuote) *oraclev1.Quote {
 		BaseAmount:      protoMoney(quote.BaseAmount),
 		QuoteAmount:     protoMoney(quote.QuoteAmount),
 		ExpiresAtUnixMs: quote.ExpiresAtUnixMs,
+		PricedAt:        pricedAt,
 		Provider:        strings.TrimSpace(quote.Provider),
 		RateRef:         strings.TrimSpace(quote.RateRef),
 		Firm:            quote.Firm,
--- a/api/payments/orchestrator/internal/service/orchestrator/convert_types_test.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/convert_types_test.go
@@ -2,6 +2,7 @@ package orchestrator

 import (
 	"testing"
+	"time"

 	paymenttypes "github.com/tech/sendico/pkg/payments/types"
 	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
@@ -10,6 +11,7 @@ import (
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )

 func TestMoneyConversionRoundTrip(t *testing.T) {
@@ -69,6 +71,7 @@ func TestFeeLineConversionRoundTrip(t *testing.T) {
 }

 func TestFXQuoteConversionRoundTrip(t *testing.T) {
+	pricedAt := int64(1700000000000)
 	proto := &oraclev1.Quote{
 		QuoteRef:        "q1",
 		Pair:            &fxv1.CurrencyPair{Base: "USD", Quote: "EUR"},
@@ -77,6 +80,7 @@ func TestFXQuoteConversionRoundTrip(t *testing.T) {
 		BaseAmount:      &moneyv1.Money{Currency: "USD", Amount: "100"},
 		QuoteAmount:     &moneyv1.Money{Currency: "EUR", Amount: "90"},
 		ExpiresAtUnixMs: 1700000000000,
+		PricedAt:        timestamppb.New(time.UnixMilli(pricedAt).UTC()),
 		Provider:        "provider",
 		RateRef:         "rate",
 		Firm:            true,
@@ -88,6 +92,9 @@ func TestFXQuoteConversionRoundTrip(t *testing.T) {
 	if model.Side != paymenttypes.FXSideSellBaseBuyQuote || model.Price.GetValue() != "0.9" {
 		t.Fatalf("fxQuoteFromProto enums mismatch: %#v", model)
 	}
+	if model.PricedAtUnixMs != pricedAt {
+		t.Fatalf("fxQuoteFromProto priced_at mismatch: %#v", model)
+	}
 	back := fxQuoteToProto(model)
 	if back == nil || back.GetQuoteRef() != "q1" || back.GetPair().GetBase() != "USD" || back.GetPair().GetQuote() != "EUR" {
 		t.Fatalf("fxQuoteToProto mismatch: %#v", back)
@@ -95,6 +102,9 @@ func TestFXQuoteConversionRoundTrip(t *testing.T) {
 	if back.GetSide() != fxv1.Side_SELL_BASE_BUY_QUOTE || back.GetPrice().GetValue() != "0.9" {
 		t.Fatalf("fxQuoteToProto enums mismatch: %#v", back)
 	}
+	if got := back.GetPricedAt(); got == nil || got.AsTime().UnixMilli() != pricedAt {
+		t.Fatalf("fxQuoteToProto priced_at mismatch: %#v", back)
+	}
 }

 func TestAssetConversionRoundTrip(t *testing.T) {
--- a/api/payments/orchestrator/internal/service/orchestrator/payment_plan_storage.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/payment_plan_storage.go
@@ -69,6 +69,7 @@ func cloneStoredFXQuote(src *paymenttypes.FXQuote) *paymenttypes.FXQuote {
 		QuoteRef:        strings.TrimSpace(src.QuoteRef),
 		Side:            src.Side,
 		ExpiresAtUnixMs: src.ExpiresAtUnixMs,
+		PricedAtUnixMs:  src.PricedAtUnixMs,
 		Provider:        strings.TrimSpace(src.Provider),
 		RateRef:         strings.TrimSpace(src.RateRef),
 		Firm:            src.Firm,
--- a/api/payments/orchestrator/internal/service/plan_builder/helpers.go
+++ b/api/payments/orchestrator/internal/service/plan_builder/helpers.go
@@ -2,6 +2,7 @@ package plan_builder

 import (
 	"strings"
+	"time"

 	"github.com/shopspring/decimal"
 	"github.com/tech/sendico/payments/storage/model"
@@ -15,6 +16,7 @@ import (
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
 	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )

 type moneyGetter interface {
@@ -226,6 +228,10 @@ func fxQuoteFromProto(quote *oraclev1.Quote) *paymenttypes.FXQuote {
 	if quote == nil {
 		return nil
 	}
+	pricedAtUnixMs := int64(0)
+	if ts := quote.GetPricedAt(); ts != nil {
+		pricedAtUnixMs = ts.AsTime().UnixMilli()
+	}
 	return &paymenttypes.FXQuote{
 		QuoteRef:        strings.TrimSpace(quote.GetQuoteRef()),
 		Pair:            pairFromProto(quote.GetPair()),
@@ -234,6 +240,7 @@ func fxQuoteFromProto(quote *oraclev1.Quote) *paymenttypes.FXQuote {
 		BaseAmount:      moneyFromProto(quote.GetBaseAmount()),
 		QuoteAmount:     moneyFromProto(quote.GetQuoteAmount()),
 		ExpiresAtUnixMs: quote.GetExpiresAtUnixMs(),
+		PricedAtUnixMs:  pricedAtUnixMs,
 		Provider:        strings.TrimSpace(quote.GetProvider()),
 		RateRef:         strings.TrimSpace(quote.GetRateRef()),
 		Firm:            quote.GetFirm(),
@@ -244,6 +251,10 @@ func fxQuoteToProto(quote *paymenttypes.FXQuote) *oraclev1.Quote {
 	if quote == nil {
 		return nil
 	}
+	var pricedAt *timestamppb.Timestamp
+	if quote.PricedAtUnixMs > 0 {
+		pricedAt = timestamppb.New(time.UnixMilli(quote.PricedAtUnixMs).UTC())
+	}
 	return &oraclev1.Quote{
 		QuoteRef:        strings.TrimSpace(quote.QuoteRef),
 		Pair:            pairToProto(quote.Pair),
@@ -252,6 +263,7 @@ func fxQuoteToProto(quote *paymenttypes.FXQuote) *oraclev1.Quote {
 		BaseAmount:      protoMoney(quote.BaseAmount),
 		QuoteAmount:     protoMoney(quote.QuoteAmount),
 		ExpiresAtUnixMs: quote.ExpiresAtUnixMs,
+		PricedAt:        pricedAt,
 		Provider:        strings.TrimSpace(quote.Provider),
 		RateRef:         strings.TrimSpace(quote.RateRef),
 		Firm:            quote.Firm,