maxapi: refactor and clean up public service api

pkg/exchange/max/maxapi/get_tickers_request.go

@@ -0,0 +1,20 @@
+package max
+
+import (
+	"github.com/c9s/requestgen"
+)
+
+//go:generate -command GetRequest requestgen -method GET
+//go:generate -command PostRequest requestgen -method POST
+//go:generate -command DeleteRequest requestgen -method DELETE
+
+type TickerMap map[string]Ticker
+
+//go:generate GetRequest -url "/api/v2/tickers" -type GetTickersRequest -responseType .TickerMap
+type GetTickersRequest struct {
+	client requestgen.APIClient
+}
+
+func (c *RestClient) NewGetTickersRequest() *GetTickersRequest {
+	return &GetTickersRequest{client: c}
+}

pkg/exchange/max/maxapi/get_tickers_request_requestgen.go

@@ -0,0 +1,135 @@
+// Code generated by "requestgen -method GET -url /api/v2/tickers -type GetTickersRequest -responseType .TickerMap"; DO NOT EDIT.
+
+package max
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"reflect"
+	"regexp"
+)
+
+// GetQueryParameters builds and checks the query parameters and returns url.Values
+func (g *GetTickersRequest) GetQueryParameters() (url.Values, error) {
+	var params = map[string]interface{}{}
+
+	query := url.Values{}
+	for _k, _v := range params {
+		query.Add(_k, fmt.Sprintf("%v", _v))
+	}
+
+	return query, nil
+}
+
+// GetParameters builds and checks the parameters and return the result in a map object
+func (g *GetTickersRequest) GetParameters() (map[string]interface{}, error) {
+	var params = map[string]interface{}{}
+
+	return params, nil
+}
+
+// GetParametersQuery converts the parameters from GetParameters into the url.Values format
+func (g *GetTickersRequest) GetParametersQuery() (url.Values, error) {
+	query := url.Values{}
+
+	params, err := g.GetParameters()
+	if err != nil {
+		return query, err
+	}
+
+	for _k, _v := range params {
+		if g.isVarSlice(_v) {
+			g.iterateSlice(_v, func(it interface{}) {
+				query.Add(_k+"[]", fmt.Sprintf("%v", it))
+			})
+		} else {
+			query.Add(_k, fmt.Sprintf("%v", _v))
+		}
+	}
+
+	return query, nil
+}
+
+// GetParametersJSON converts the parameters from GetParameters into the JSON format
+func (g *GetTickersRequest) GetParametersJSON() ([]byte, error) {
+	params, err := g.GetParameters()
+	if err != nil {
+		return nil, err
+	}
+
+	return json.Marshal(params)
+}
+
+// GetSlugParameters builds and checks the slug parameters and return the result in a map object
+func (g *GetTickersRequest) GetSlugParameters() (map[string]interface{}, error) {
+	var params = map[string]interface{}{}
+
+	return params, nil
+}
+
+func (g *GetTickersRequest) applySlugsToUrl(url string, slugs map[string]string) string {
+	for _k, _v := range slugs {
+		needleRE := regexp.MustCompile(":" + _k + "\\b")
+		url = needleRE.ReplaceAllString(url, _v)
+	}
+
+	return url
+}
+
+func (g *GetTickersRequest) iterateSlice(slice interface{}, _f func(it interface{})) {
+	sliceValue := reflect.ValueOf(slice)
+	for _i := 0; _i < sliceValue.Len(); _i++ {
+		it := sliceValue.Index(_i).Interface()
+		_f(it)
+	}
+}
+
+func (g *GetTickersRequest) isVarSlice(_v interface{}) bool {
+	rt := reflect.TypeOf(_v)
+	switch rt.Kind() {
+	case reflect.Slice:
+		return true
+	}
+	return false
+}
+
+func (g *GetTickersRequest) GetSlugsMap() (map[string]string, error) {
+	slugs := map[string]string{}
+	params, err := g.GetSlugParameters()
+	if err != nil {
+		return slugs, nil
+	}
+
+	for _k, _v := range params {
+		slugs[_k] = fmt.Sprintf("%v", _v)
+	}
+
+	return slugs, nil
+}
+
+func (g *GetTickersRequest) Do(ctx context.Context) (TickerMap, error) {
+
+	// no body params
+	var params interface{}
+	query := url.Values{}
+
+	apiURL := "/api/v2/tickers"
+
+	req, err := g.client.NewRequest(ctx, "GET", apiURL, query, params)
+	if err != nil {
+		return nil, err
+	}
+
+	response, err := g.client.SendRequest(req)
+	if err != nil {
+		return nil, err
+	}
+
+	var apiResponse TickerMap
+	if err := response.DecodeJSON(&apiResponse); err != nil {
+		return nil, err
+	}
+	return apiResponse, nil
+}

pkg/exchange/max/maxapi/public.go

@@ -65,35 +65,9 @@ func (s *PublicService) Markets() ([]Market, error) {
 	return markets, nil
 }
 
-func (s *PublicService) Tickers() (map[string]Ticker, error) {
+func (s *PublicService) Tickers() (TickerMap, error) {
-	var endPoint = "v2/tickers"
+	req := s.client.NewGetTickersRequest()
-	req, err := s.client.NewRequest(context.Background(), "GET", endPoint, url.Values{}, nil)
+	return req.Do(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	response, err := s.client.SendRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	v, err := fastjson.ParseBytes(response.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	o, err := v.Object()
-	if err != nil {
-		return nil, err
-	}
-
-	var tickers = make(map[string]Ticker)
-	o.Visit(func(key []byte, v *fastjson.Value) {
-		var ticker = mustParseTicker(v)
-		tickers[string(key)] = ticker
-	})
-
-	return tickers, nil
 }
 
 func (s *PublicService) Ticker(market string) (*Ticker, error) {

pkg/exchange/max/maxapi/reward_test.go

@@ -7,6 +7,33 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestPublicService(t *testing.T) {
+	key, secret, ok := integrationTestConfigured(t, "MAX")
+	if !ok {
+		t.SkipNow()
+	}
+
+	ctx := context.Background()
+	client := NewRestClient(ProductionAPIURL)
+	client.Auth(key, secret)
+
+	t.Run("v2/timestamp", func(t *testing.T) {
+		req := client.NewGetTimestampRequest()
+		serverTimestamp, err := req.Do(ctx)
+		assert.NoError(t, err)
+		assert.NotZero(t, serverTimestamp)
+	})
+
+	t.Run("v2/tickers", func(t *testing.T) {
+		req := client.NewGetTickersRequest()
+		tickers, err := req.Do(ctx)
+		assert.NoError(t, err)
+		assert.NotNil(t, tickers)
+		assert.NotEmpty(t, tickers)
+		assert.NotEmpty(t, tickers["btcusdt"])
+	})
+}
+
 func TestRewardService_GetRewardsRequest(t *testing.T) {
 	key, secret, ok := integrationTestConfigured(t, "MAX")
 	if !ok {