Merge pull request #2374 from c9s/dboy/slack/order-exchange-field

FEATURE: [order] add fields to Slack attachment

Author: dboyliao

pkg/types/order.go

@@ -538,23 +538,22 @@ func (o Order) PlainText() string {
 }
 
 func (o Order) SlackAttachment() slack.Attachment {
-	var fields = []slack.AttachmentField{
-		{Title: "Symbol", Value: o.Symbol, Short: true},
-		{Title: "Side", Value: string(o.Side), Short: true},
-		{Title: "Price", Value: o.Price.String(), Short: true},
-		{
-			Title: "Executed Quantity",
-			Value: o.ExecutedQuantity.String() + "/" + o.Quantity.String(),
+
+	var fields []slack.AttachmentField
+	if o.UUID != "" {
+		fields = append(fields, slack.AttachmentField{
+			Title: "UUID",
+			Value: o.UUID + fmt.Sprintf(" (%d)", o.OrderID),
+			Short: false,
+		})
+	} else {
+		fields = append(fields, slack.AttachmentField{
+			Title: "ID",
+			Value: strconv.FormatUint(o.OrderID, 10),
 			Short: true,
-		},
+		})
 	}
 
-	fields = append(fields, slack.AttachmentField{
-		Title: "ID",
-		Value: strconv.FormatUint(o.OrderID, 10),
-		Short: true,
-	})
-
 	orderStatusIcon := ""
 
 	switch o.Status {
@@ -576,11 +575,19 @@ func (o Order) SlackAttachment() slack.Attachment {
 	})
 
 	footerIcon := ExchangeFooterIcon(o.Exchange)
+	fillRatio := o.ExecutedQuantity.Div(o.Quantity)
+	orderDetail := fmt.Sprintf(
+		"%s/%s @ %s (fill ratio: %s)",
+		o.ExecutedQuantity.String(),
+		o.Quantity.String(),
+		o.Price.String(),
+		fillRatio.Percentage(),
+	)
 
 	return slack.Attachment{
-		Color: SideToColorName(o.Side),
-		Title: string(o.Type) + " Order " + string(o.Side),
-		// Text:   "",
+		Color:      SideToColorName(o.Side),
+		Title:      string(o.Type) + " Order " + string(o.Side) + " " + o.Symbol,
+		Text:       orderDetail,
 		Fields:     fields,
 		FooterIcon: footerIcon,
 		Footer:     strings.ToLower(o.Exchange.String()) + templateutil.Render(" creation time {{ . }}", o.CreationTime.Time().Format(time.StampMilli)),

pkg/types/trade.go

@@ -227,18 +227,36 @@ func (trade Trade) SlackAttachment() slack.Attachment {
 	liquidity := trade.Liquidity()
 	text := templateutil.Render(slackTradeTextTemplate, trade)
 
+	fields := []slack.AttachmentField{
+		{Title: "QuoteQuantity", Value: trade.QuoteQuantity.String(), Short: true},
+		{Title: "Fee", Value: trade.Fee.String() + " " + trade.FeeCurrency, Short: true},
+		{Title: "Liquidity", Value: liquidity, Short: true},
+	}
+
+	if trade.OrderUUID != "" {
+		fields = append(
+			fields,
+			slack.AttachmentField{
+				Title: "Order ID",
+				Value: fmt.Sprintf("%s (%s)", trade.OrderUUID, strconv.FormatUint(trade.OrderID, 10)),
+				Short: false,
+			})
+	} else {
+		fields = append(
+			fields,
+			slack.AttachmentField{
+				Title: "Order ID",
+				Value: strconv.FormatUint(trade.OrderID, 10),
+				Short: true,
+			})
+	}
+
 	return slack.Attachment{
 		Text: text,
 		// Title: ...
 		// Pretext: pretext,
-		Color: color,
-		Fields: []slack.AttachmentField{
-			{Title: "Exchange", Value: trade.Exchange.String(), Short: true},
-			{Title: "QuoteQuantity", Value: trade.QuoteQuantity.String(), Short: true},
-			{Title: "Fee", Value: trade.Fee.String() + " " + trade.FeeCurrency, Short: true},
-			{Title: "Liquidity", Value: liquidity, Short: true},
-			{Title: "Order ID", Value: strconv.FormatUint(trade.OrderID, 10), Short: true},
-		},
+		Color:      color,
+		Fields:     fields,
 		FooterIcon: ExchangeFooterIcon(trade.Exchange),
 		Footer:     strings.ToLower(trade.Exchange.String()) + templateutil.Render(" traded at {{ . }}", trade.Time.Time().Format(time.StampMilli)),
 	}