Merge pull request #2107 from c9s/dboy/types-trade-add-uuid

dboyliao · web-flow · commit 1a8547c8c152 · 2025-07-22T14:57:12.000+08:00
FEATURE: [migrations] Add order uuid column in `orders` and `trades` tables
diff --git a/migrations/mysql/20250721140324_orders_add_uuid.sql b/migrations/mysql/20250721140324_orders_add_uuid.sql
@@ -0,0 +1,9 @@
+-- +up
+-- +begin
+ALTER TABLE `orders` ADD COLUMN `uuid` VARBINARY(36) NOT NULL DEFAULT '';
+-- +end
+
+-- +down
+-- +begin
+ALTER TABLE `orders` DROP COLUMN `uuid`;
+-- +end
diff --git a/migrations/mysql/20250721140334_trades_add_order_uuid.sql b/migrations/mysql/20250721140334_trades_add_order_uuid.sql
@@ -0,0 +1,9 @@
+-- +up
+-- +begin
+ALTER TABLE `trades` ADD COLUMN `order_uuid` VARBINARY(16) NOT NULL DEFAULT '';
+-- +end
+
+-- +down
+-- +begin
+ALTER TABLE `trades` DROP COLUMN `order_uuid`;
+-- +end
diff --git a/migrations/sqlite3/20250721175639_trades_add_order_uuid.sql b/migrations/sqlite3/20250721175639_trades_add_order_uuid.sql
@@ -0,0 +1,9 @@
+-- +up
+-- +begin
+ALTER TABLE orders ADD COLUMN uuid TEXT NOT NULL DEFAULT '';
+-- +end
+
+-- +down
+-- +begin
+ALTER TABLE orders DROP COLUMN uuid;
+-- +end
diff --git a/migrations/sqlite3/20250721175655_orders_add_uuid.sql b/migrations/sqlite3/20250721175655_orders_add_uuid.sql
@@ -0,0 +1,9 @@
+-- +up
+-- +begin
+ALTER TABLE trades ADD COLUMN order_uuid TEXT NOT NULL DEFAULT '';
+-- +end
+
+-- +down
+-- +begin
+ALTER TABLE trades DROP COLUMN order_uuid;
+-- +end
diff --git a/pkg/exchange/coinbase/convert.go b/pkg/exchange/coinbase/convert.go
@@ -73,6 +73,7 @@ func toGlobalTrade(cbTrade *api.Trade) types.Trade {
 	return types.Trade{
 		ID:            cbTrade.TradeID,
 		OrderID:       FNV64a(cbTrade.OrderID),
+		OrderUUID:     cbTrade.OrderID,
 		Exchange:      types.ExchangeCoinBase,
 		Price:         cbTrade.Price,
 		Quantity:      cbTrade.Size,
diff --git a/pkg/migrations/mysql/main_20250721140324_orders_add_uuid.go b/pkg/migrations/mysql/main_20250721140324_orders_add_uuid.go
@@ -0,0 +1,29 @@
+package mysql
+
+import (
+	"context"
+
+	"github.com/c9s/rockhopper/v2"
+)
+
+func init() {
+	AddMigration("main", up_main_ordersAddUuid, down_main_ordersAddUuid)
+}
+
+func up_main_ordersAddUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is applied.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE `orders` ADD COLUMN `uuid` VARBINARY(36) NOT NULL DEFAULT '';")
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func down_main_ordersAddUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is rolled back.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE `orders` DROP COLUMN `uuid`;")
+	if err != nil {
+		return err
+	}
+	return err
+}
diff --git a/pkg/migrations/mysql/main_20250721140334_trades_add_order_uuid.go b/pkg/migrations/mysql/main_20250721140334_trades_add_order_uuid.go
@@ -0,0 +1,29 @@
+package mysql
+
+import (
+	"context"
+
+	"github.com/c9s/rockhopper/v2"
+)
+
+func init() {
+	AddMigration("main", up_main_tradesAddOrderUuid, down_main_tradesAddOrderUuid)
+}
+
+func up_main_tradesAddOrderUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is applied.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE `trades` ADD COLUMN `order_uuid` VARBINARY(16) NOT NULL DEFAULT '';")
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func down_main_tradesAddOrderUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is rolled back.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE `trades` DROP COLUMN `order_uuid`;")
+	if err != nil {
+		return err
+	}
+	return err
+}
diff --git a/pkg/migrations/sqlite3/main_20250721175639_trades_add_order_uuid.go b/pkg/migrations/sqlite3/main_20250721175639_trades_add_order_uuid.go
@@ -0,0 +1,29 @@
+package sqlite3
+
+import (
+	"context"
+
+	"github.com/c9s/rockhopper/v2"
+)
+
+func init() {
+	AddMigration("main", up_main_tradesAddOrderUuid, down_main_tradesAddOrderUuid)
+}
+
+func up_main_tradesAddOrderUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is applied.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE orders ADD COLUMN uuid TEXT NOT NULL DEFAULT '';")
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func down_main_tradesAddOrderUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is rolled back.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE orders DROP COLUMN uuid;")
+	if err != nil {
+		return err
+	}
+	return err
+}
diff --git a/pkg/migrations/sqlite3/main_20250721175655_orders_add_uuid.go b/pkg/migrations/sqlite3/main_20250721175655_orders_add_uuid.go
@@ -0,0 +1,29 @@
+package sqlite3
+
+import (
+	"context"
+
+	"github.com/c9s/rockhopper/v2"
+)
+
+func init() {
+	AddMigration("main", up_main_ordersAddUuid, down_main_ordersAddUuid)
+}
+
+func up_main_ordersAddUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is applied.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE trades ADD COLUMN order_uuid TEXT NOT NULL DEFAULT '';")
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func down_main_ordersAddUuid(ctx context.Context, tx rockhopper.SQLExecutor) (err error) {
+	// This code is executed when the migration is rolled back.
+	_, err = tx.ExecContext(ctx, "ALTER TABLE trades DROP COLUMN order_uuid;")
+	if err != nil {
+		return err
+	}
+	return err
+}
diff --git a/pkg/service/order.go b/pkg/service/order.go
@@ -203,15 +203,15 @@ func (s *OrderService) scanRows(rows *sqlx.Rows) (orders []types.Order, err erro
 func (s *OrderService) Insert(order types.Order) (err error) {
 	if s.DB.DriverName() == "mysql" {
 		_, err = s.DB.NamedExec(`
-			INSERT INTO orders (exchange, order_id, client_order_id, order_type, status, symbol, price, stop_price, quantity, executed_quantity, side, is_working, time_in_force, created_at, updated_at, is_margin, is_futures, is_isolated)
-			VALUES (:exchange, :order_id, :client_order_id, :order_type, :status, :symbol, :price, :stop_price, :quantity, :executed_quantity, :side, :is_working, :time_in_force, :created_at, :updated_at, :is_margin, :is_futures, :is_isolated)
+			INSERT INTO orders (exchange, order_id, client_order_id, order_type, status, symbol, price, stop_price, quantity, executed_quantity, side, is_working, time_in_force, created_at, updated_at, is_margin, is_futures, is_isolated, uuid)
+			VALUES (:exchange, :order_id, :client_order_id, :order_type, :status, :symbol, :price, :stop_price, :quantity, :executed_quantity, :side, :is_working, :time_in_force, :created_at, :updated_at, :is_margin, :is_futures, :is_isolated, UUID_TO_BIN(:uuid, true))
 			ON DUPLICATE KEY UPDATE status=:status, executed_quantity=:executed_quantity, is_working=:is_working, updated_at=:updated_at`, order)
 		return err
 	}
 
 	_, err = s.DB.NamedExec(`
 			INSERT INTO orders (exchange, order_id, client_order_id, order_type, status, symbol, price, stop_price, quantity, executed_quantity, side, is_working, time_in_force, created_at, updated_at, is_margin, is_futures, is_isolated)
-			VALUES (:exchange, :order_id, :client_order_id, :order_type, :status, :symbol, :price, :stop_price, :quantity, :executed_quantity, :side, :is_working, :time_in_force, :created_at, :updated_at, :is_margin, :is_futures, :is_isolated)
+			VALUES (:exchange, :order_id, :client_order_id, :order_type, :status, :symbol, :price, :stop_price, :quantity, :executed_quantity, :side, :is_working, :time_in_force, :created_at, :updated_at, :is_margin, :is_futures, :is_isolated, :uuid)
 	`, order)
 
 	return err
diff --git a/pkg/service/trade.go b/pkg/service/trade.go
@@ -118,6 +118,10 @@ func (s *TradeService) Sync(
 				id := strconv.FormatUint(trade.ID, 10) + trade.Side.String()
 				return id
 			},
+			Insert: func(obj interface{}) error {
+				trade := obj.(types.Trade)
+				return s.Insert(trade)
+			},
 			LogInsert: true,
 		},
 	}
@@ -436,6 +440,14 @@ func (s *TradeService) scanRows(rows *sqlx.Rows) (trades []types.Trade, err erro
 }
 
 func (s *TradeService) Insert(trade types.Trade) error {
+	if s.DB.DriverName() == "mysql" {
+		_, err := s.DB.NamedExec(`
+			INSERT INTO trades (id, order_id, order_uuid, exchange, price, quantity, quote_quantity, symbol, side, is_buyer, is_maker, traded_at, fee, fee_currency, is_margin, is_futures, is_isolated, strategy, pnl)
+			VALUES (:id, :order_id, UUID_TO_BIN(:order_uuid, true), :exchange, :price, :quantity, :quote_quantity, :symbol, :side, :is_buyer, :is_maker, :traded_at, :fee, :fee_currency, :is_margin, :is_futures, :is_isolated, :strategy, :pnl)
+			ON DUPLICATE KEY UPDATE id=:id, order_id=:order_id, order_uuid=:order_uuid, exchange=:exchange, price=:price, quantity=:quantity, quote_quantity=:quote_quantity, symbol=:symbol, side=:side, is_buyer=:is_buyer, is_maker=:is_maker, traded_at=:traded_at, fee=:fee, fee_currency=:fee_currency, is_margin=:is_margin, is_futures=:is_futures, is_isolated=:is_isolated, strategy=:strategy, pnl=:pnl;`,
+			trade)
+		return err
+	}
 	sql := dbCache.InsertSqlOf(trade)
 	_, err := s.DB.NamedExec(sql, trade)
 	return err
diff --git a/pkg/types/order.go b/pkg/types/order.go
@@ -283,7 +283,7 @@ type Order struct {
 	// GID is used for relational database storage, it's an incremental ID
 	GID     uint64 `json:"gid,omitempty" db:"gid"`
 	OrderID uint64 `json:"orderID" db:"order_id"` // order id
-	UUID    string `json:"uuid,omitempty"`
+	UUID    string `json:"uuid,omitempty" db:"uuid"`
 
 	Status OrderStatus `json:"status" db:"status"`
 
diff --git a/pkg/types/trade.go b/pkg/types/trade.go
@@ -70,6 +70,7 @@ type Trade struct {
 	// ID is the source trade ID
 	ID            uint64           `json:"id" db:"id"`
 	OrderID       uint64           `json:"orderID" db:"order_id"`
+	OrderUUID     string           `json:"orderUUID,omitempty" db:"order_uuid"`
 	Exchange      ExchangeName     `json:"exchange" db:"exchange"`
 	Price         fixedpoint.Value `json:"price" db:"price"`
 	Quantity      fixedpoint.Value `json:"quantity" db:"quantity"`
@@ -180,7 +181,11 @@ func trimTrailingZero(a float64) string {
 
 // String is for console output
 func (trade Trade) String() string {
-	return fmt.Sprintf("TRADE %s %s %4s %-4s @ %-6s | AMOUNT %s | FEE %s %s | OrderID %d | TID %d | %s | %s",
+	orderID := trade.OrderUUID
+	if orderID == "" {
+		orderID = strconv.FormatUint(trade.OrderID, 10)
+	}
+	return fmt.Sprintf("TRADE %s %s %4s %-4s @ %-6s | AMOUNT %s | FEE %s %s | OrderID %s | TID %d | %s | %s",
 		trade.Exchange.String(),
 		trade.Symbol,
 		trade.Side,
@@ -189,7 +194,7 @@ func (trade Trade) String() string {
 		trade.QuoteQuantity.String(),
 		trade.Fee.String(),
 		trade.FeeCurrency,
-		trade.OrderID,
+		orderID,
 		trade.ID,
 		trade.Time.Time().Format(time.StampMilli),
 		trade.Liquidity(),

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +-- +up
 +-- +begin
 +ALTER TABLE `orders` ADD COLUMN `uuid` VARBINARY(36) NOT NULL DEFAULT '';
 +-- +end
++
 +-- +down
 +-- +begin
 +ALTER TABLE `orders` DROP COLUMN `uuid`;
 +-- +end