From ac512fc03eb7698b3103021abbbf7e0c961dcdd7 Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Tue, 27 Feb 2018 15:31:46 +0300 Subject: [PATCH] cleanup --- README.md | 1 - client.go | 112 ------------------------------------------------- client_test.go | 45 -------------------- 3 files changed, 158 deletions(-) delete mode 100644 client.go delete mode 100644 client_test.go diff --git a/README.md b/README.md index 432c043..c143760 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![Build Status](https://img.shields.io/travis/retailcrm/api-client-go/master.svg?style=flat-square)](https://travis-ci.org/retailcrm/api-client-go) -[![Downloads](https://img.shields.io/github/downloads/dt/retailcrm/api-client-go.svg?style=flat-square)](https://packagist.org/packages/retailcrm/api-client-go/stats) # retailCRM API Go client diff --git a/client.go b/client.go deleted file mode 100644 index 1b37527..0000000 --- a/client.go +++ /dev/null @@ -1,112 +0,0 @@ -package retailcrm - -import ( - "encoding/json" - "errors" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "strings" - "time" -) - -const ( - ApiPrefix = "/api/v5" -) - -type Client struct { - Url string - apiKey string - httpClient *http.Client -} - -type ErrorResponse struct { - ErrorMsg string `json:"errorMsg,omitempty"` - Errors map[string]string `json:"errors,omitempty"` -} - -func New(url string, apiKey string) *Client { - return &Client{ - url, - apiKey, - &http.Client{Timeout: 20 * time.Second}, - } -} - -func (r *Client) GetRequest(urlWithParameters string) ([]byte, int, error) { - var res []byte - - req, err := http.NewRequest("GET", fmt.Sprintf("%s%s%s", r.Url, ApiPrefix, urlWithParameters), nil) - if err != nil { - return res, 0, err - } - - req.Header.Set("X-API-KEY", r.apiKey) - - resp, err := r.httpClient.Do(req) - if err != nil { - return res, 0, err - } - - if resp.StatusCode >= http.StatusInternalServerError { - return res, resp.StatusCode, errors.New(fmt.Sprintf("HTTP request error. Status code: %d.\n", resp.StatusCode)) - } - - res, err = buildRawResponse(resp) - if err != nil { - return res, 0, err - } - - return res, resp.StatusCode, nil -} - -func (r *Client) PostRequest(url string, postParams url.Values) ([]byte, int, error) { - var res []byte - - req, err := http.NewRequest( - "POST", - fmt.Sprintf("%s%s%s", r.Url, ApiPrefix, url), - strings.NewReader(postParams.Encode()), - ) - if err != nil { - return res, 0, err - } - - req.Header.Set("Content-Type", "application/x-www-form-urlencoded") - req.Header.Set("X-API-KEY", r.apiKey) - - resp, err := r.httpClient.Do(req) - if err != nil { - return res, 0, err - } - - if resp.StatusCode >= http.StatusInternalServerError { - return res, resp.StatusCode, errors.New(fmt.Sprintf("HTTP request error. Status code: %d.\n", resp.StatusCode)) - } - - res, err = buildRawResponse(resp) - if err != nil { - return res, 0, err - } - - return res, resp.StatusCode, nil -} - -func buildRawResponse(resp *http.Response) ([]byte, error) { - defer resp.Body.Close() - - res, err := ioutil.ReadAll(resp.Body) - if err != nil { - return res, err - } - - return res, nil -} - -func (r *Client) ErrorResponse(data []byte) (*ErrorResponse, error) { - var resp ErrorResponse - err := json.Unmarshal(data, &resp) - - return &resp, err -} diff --git a/client_test.go b/client_test.go deleted file mode 100644 index 80110ae..0000000 --- a/client_test.go +++ /dev/null @@ -1,45 +0,0 @@ -package retailcrm - -import ( - "net/http" - "net/url" - "testing" -) - -const ( - TestUrl = "https://demo.retailcrm.ru" - TestApiKey = "111" - WrongApiKeyMsg = "Wrong \"apiKey\" value." -) - -func client() *Client { - return New(TestUrl, TestApiKey) -} - -func TestGetRequest(t *testing.T) { - c := client() - - data, status, _ := c.GetRequest("/store/products") - if status != http.StatusForbidden { - t.Fail() - } - - resp, _ := c.ErrorResponse(data) - if resp.ErrorMsg != WrongApiKeyMsg { - t.Fail() - } -} - -func TestPostRequest(t *testing.T) { - c := client() - - data, status, _ := c.PostRequest("/orders/create", url.Values{}) - if status != http.StatusForbidden { - t.Fail() - } - - resp, _ := c.ErrorResponse(data) - if resp.ErrorMsg != WrongApiKeyMsg { - t.Fail() - } -}