Merge pull request #13 from itsksaurabh/improve/timefields

Improve/timefields

marketStatus.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
@@ -66,12 +67,29 @@ type Market struct {
 	// Top ask order price
 	Sell string `json:"sell,omitempty"`
 	// Top bid order price
-	Buy                string  `json:"buy,omitempty"`
-	At                 int     `json:"at,omitempty"`
-	MaxBuyAmount       int     `json:"maxBuyAmount,omitempty"`
-	MinBuyVolume       int     `json:"minBuyVolume,omitempty"`
-	MaxBuyVolume       int     `json:"maxBuyVolume,omitempty"`
-	FeePercentOnProfit float64 `json:"feePercentOnProfit,omitempty"`
+	Buy                string    `json:"buy,omitempty"`
+	At                 time.Time `json:"at,omitempty"`
+	MaxBuyAmount       int       `json:"maxBuyAmount,omitempty"`
+	MinBuyVolume       int       `json:"minBuyVolume,omitempty"`
+	MaxBuyVolume       int       `json:"maxBuyVolume,omitempty"`
+	FeePercentOnProfit float64   `json:"feePercentOnProfit,omitempty"`
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface.
+// coverts Timestamp from `int` to unix timestamp
+func (m *Market) UnmarshalJSON(data []byte) error {
+	type Alias Market
+	aux := &struct {
+		At int64 `json:"at,omitempty"`
+		*Alias
+	}{
+		Alias: (*Alias)(m),
+	}
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+	m.At = time.Unix(aux.At, 0)
+	return nil
 }
 
 // Asset holds asset related data

marketTicker.go

@@ -2,7 +2,9 @@ package wazirx
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/pkg/errors"
 )
@@ -29,11 +31,28 @@ type TickerData struct {
 	// Top bid order price
 	Buy string `json:"buy"`
 	// Timestamp when ticker information is fetched
-	At int `json:"at"`
+	At time.Time `json:"at"`
 	// Display text of market
 	Name string `json:"name"`
 }
 
+// UnmarshalJSON implements the json.Unmarshaler interface.
+// coverts Timestamp from `int` to unix timestamp
+func (t *TickerData) UnmarshalJSON(data []byte) error {
+	type Alias TickerData
+	aux := &struct {
+		At int64 `json:"at"`
+		*Alias
+	}{
+		Alias: (*Alias)(t),
+	}
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+	t.At = time.Unix(aux.At, 0)
+	return nil
+}
+
 // MarketTicker returs  the latest market heart-beat for all the markets for the last 24hrs.
 func (c Client) MarketTicker(ctx context.Context) (data map[string]TickerData, err error) {
 	endpoint := "/api/v2/tickers"