Clean FetchOrder

rluisr · Sep 26, 2022 · 2d75077 · 2d75077
1 parent 7ac0bfb
commit 2d75077
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/example/curl.txt b/example/curl.txt
@@ -1,10 +1,10 @@
 POST /tv
 
 TP/SL: price
-curl -s -XPOST -H "Content-Type: application/json" -d '{"is_test_net": true, "api_key": "OReF54nygvv9IwbC0h", "api_secret_key": "fyyoeWmaLVj74gHsIaThT9WK8T7CpCBjNBFK", "order": { "symbol": "BTCUSDT", "type": "Market", "price": 0, "side": "Sell", "qty": 0.03, "tp": "0", "sl": "0" } }' http://localhost:3001/tv
+curl -s -XPOST -H "Content-Type: application/json" -d '{"is_test_net": true, "api_key": "OReF54nygvv9IwbC0h", "api_secret_key": "fyyoeWmaLVj74gHsIaThT9WK8T7CpCBjNBFK", "order": { "name": "test", "symbol": "BTCUSDT", "type": "Market", "price": 0, "side": "Sell", "qty": 0.03, "tp": "0", "sl": "0" } }' http://localhost:3001/tv
 
 TP/SL: percent
-curl -s -XPOST -H "Content-Type: application/json" -d '{"is_test_net": true, "api_key": "OReF54nygvv9IwbC0h", "api_secret_key": "fyyoeWmaLVj74gHsIaThT9WK8T7CpCBjNBFK", "order": { "symbol": "BTCUSDT", "type": "Market", "price": 0, "side": "Buy", "qty": 0.01, "tp": "1%", "sl": "5%" } }' http://localhost:3001/tv
+curl -s -XPOST -H "Content-Type: application/json" -d '{"is_test_net": true, "api_key": "OReF54nygvv9IwbC0h", "api_secret_key": "fyyoeWmaLVj74gHsIaThT9WK8T7CpCBjNBFK", "order": { "name": "test", "symbol": "BTCUSDT", "type": "Market", "price": 0, "side": "Buy", "qty": 0.01, "tp": "1%", "sl": "5%" } }' http://localhost:3001/tv
 
 GET /setting
 

diff --git a/pkg/adapter/gateway/bybit_repository.go b/pkg/adapter/gateway/bybit_repository.go
@@ -94,21 +94,13 @@ func (r *BybitRepository) CreateOrder(req domain.TV) (string, error) {
 
 // FetchOrder is set entry price
 func (r *BybitRepository) FetchOrder(req *domain.TV, orderID string) error {
-	req.Order = domain.TVOrder{
-		OrderID: orderID,
-		Type:    req.Order.Type,
-		Symbol:  req.Order.Symbol,
-		Side:    req.Order.Side,
-		QTY:     req.Order.QTY,
-		TP:      req.Order.TP,
-		SL:      req.Order.SL,
-	}
-
 	entryPrice, err := r.getEntryPrice(req)
 	if err != nil {
 		return err
 	}
+
 	req.Order.EntryPrice = *entryPrice
+	req.Order.OrderID = orderID
 
 	return nil
 }

diff --git a/pkg/domain/tv.go b/pkg/domain/tv.go
@@ -32,7 +32,7 @@ type TV struct {
 
 type TVOrder struct {
 	gorm.Model
-	Name       string          `gorm:"type:varchar(255)" json:"name"` // alert name, description or something
+	Name       string          `gorm:"type:varchar(255);default:null" json:"name"` // alert name, description or something
 	CEX        string          `gorm:"type:varchar(255);not null" json:"-"`
 	SettingID  uint64          `gorm:"type:uint;not null" json:"-"`
 	OrderID    string          `gorm:"type:varchar(255);uniqueIndex:order_id;not null"`