diff --git a/pkg/accounting/pnl/report.go b/pkg/accounting/pnl/report.go index 1468ed5ec..74c0a2bdc 100644 --- a/pkg/accounting/pnl/report.go +++ b/pkg/accounting/pnl/report.go @@ -13,32 +13,34 @@ import ( ) type AverageCostPnlReport struct { - CurrentPrice float64 - StartTime time.Time - Symbol string - Market types.Market + LastPrice float64 `json:"lastPrice"` + StartTime time.Time `json:"startTime"` + Symbol string `json:"symbol"` + Market types.Market `json:"market"` - NumTrades int - Profit, NetProfit, UnrealizedProfit fixedpoint.Value - AverageBidCost float64 - BuyVolume float64 - SellVolume float64 - FeeInUSD float64 - Stock float64 - CurrencyFees map[string]float64 + NumTrades int `json:"numTrades"` + Profit fixedpoint.Value `json:"profit"` + NetProfit fixedpoint.Value `json:"netProfit"` + UnrealizedProfit fixedpoint.Value `json:"unrealizedProfit"` + AverageCost float64 `json:"averageCost,omitempty"` + BuyVolume float64 `json:"buyVolume,omitempty"` + SellVolume float64 `json:"sellVolume,omitempty"` + FeeInUSD float64 `json:"feeInUSD,omitempty"` + Stock float64 `json:"stock,omitempty"` + CurrencyFees map[string]float64 `json:"currencyFees,omitempty"` } func (report AverageCostPnlReport) Print() { log.Infof("TRADES SINCE: %v", report.StartTime) log.Infof("NUMBER OF TRADES: %d", report.NumTrades) - log.Infof("AVERAGE COST: %s", types.USD.FormatMoneyFloat64(report.AverageBidCost)) + log.Infof("AVERAGE COST: %s", types.USD.FormatMoneyFloat64(report.AverageCost)) log.Infof("TOTAL BUY VOLUME: %f", report.BuyVolume) log.Infof("TOTAL SELL VOLUME: %f", report.SellVolume) log.Infof("STOCK: %f", report.Stock) // FIXME: // log.Infof("FEE (USD): %f", report.FeeInUSD) - log.Infof("CURRENT PRICE: %s", types.USD.FormatMoneyFloat64(report.CurrentPrice)) + log.Infof("CURRENT PRICE: %s", types.USD.FormatMoneyFloat64(report.LastPrice)) log.Infof("CURRENCY FEES:") for currency, fee := range report.CurrencyFees { log.Infof(" - %s: %f", currency, fee) @@ -63,9 +65,9 @@ func (report AverageCostPnlReport) SlackAttachment() slack.Attachment { Fields: []slack.AttachmentField{ {Title: "Profit", Value: types.USD.FormatMoney(report.Profit)}, {Title: "Unrealized Profit", Value: types.USD.FormatMoney(report.UnrealizedProfit)}, - {Title: "Current Price", Value: report.Market.FormatPrice(report.CurrentPrice), Short: true}, - {Title: "Average Cost", Value: report.Market.FormatPrice(report.AverageBidCost), Short: true}, - + {Title: "Current Price", Value: report.Market.FormatPrice(report.LastPrice), Short: true}, + {Title: "Average Cost", Value: report.Market.FormatPrice(report.AverageCost), Short: true}, + // FIXME: // {Title: "Fee (USD)", Value: types.USD.FormatMoney(report.FeeInUSD), Short: true}, {Title: "Stock", Value: strconv.FormatFloat(report.Stock, 'f', 8, 64), Short: true},