From a96598249862d30412470c3851006ea763faf7fd Mon Sep 17 00:00:00 2001 From: Ruslan Efanov Date: Thu, 15 Apr 2021 13:41:08 +0300 Subject: [PATCH] edit tests --- v5/client.go | 646 +++++++++------------- v5/client_test.go | 1340 ++++++++++++++++++++++----------------------- v5/error.go | 19 +- v5/filters.go | 46 +- v5/marshaling.go | 4 +- v5/request.go | 62 +-- v5/response.go | 160 +++--- v5/types.go | 180 +++--- 8 files changed, 1167 insertions(+), 1290 deletions(-) diff --git a/v5/client.go b/v5/client.go index 331c116..5d37da6 100644 --- a/v5/client.go +++ b/v5/client.go @@ -17,7 +17,7 @@ import ( "github.com/google/go-querystring/query" ) -// New initialize client +// New initialize client. func New(url string, key string) *Client { return &Client{ URL: url, @@ -26,7 +26,7 @@ func New(url string, key string) *Client { } } -// GetRequest implements GET Request +// GetRequest implements GET Request. func (c *Client) GetRequest(urlWithParameters string, versioned ...bool) ([]byte, int, error) { var res []byte var prefix = "/api/v5" @@ -73,7 +73,7 @@ func (c *Client) GetRequest(urlWithParameters string, versioned ...bool) ([]byte return res, resp.StatusCode, nil } -// PostRequest implements POST Request with generic body data +// PostRequest implements POST Request with generic body data. func (c *Client) PostRequest(uri string, postData interface{}, contType ...string) ([]byte, int, error) { var ( res []byte @@ -118,8 +118,8 @@ func (c *Client) PostRequest(uri string, postData interface{}, contType ...strin if err != nil { return res, 0, err } - fmt.Println(resp) - if resp.StatusCode >= http.StatusBadRequest { + + if resp.StatusCode >= http.StatusInternalServerError { apiError.ErrorMsg = fmt.Sprintf("HTTP request error. Status code: %d.\n", resp.StatusCode) return res, resp.StatusCode, apiError } @@ -147,7 +147,7 @@ func buildRawResponse(resp *http.Response) ([]byte, error) { return res, nil } -// checkBy select identifier type +// checkBy select identifier type. func checkBy(by string) string { var context = ByID @@ -158,7 +158,7 @@ func checkBy(by string) string { return context } -// fillSite add site code to parameters if present +// fillSite add site code to parameters if present. func fillSite(p *url.Values, site []string) { if len(site) > 0 { s := site[0] @@ -194,15 +194,14 @@ func (c *Client) APIVersions() (VersionResponse, int, error) { var resp VersionResponse data, status, err := c.GetRequest("/api-versions", false) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -233,15 +232,14 @@ func (c *Client) APICredentials() (CredentialResponse, int, error) { var resp CredentialResponse data, status, err := c.GetRequest("/credentials", false) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -279,15 +277,14 @@ func (c *Client) Customers(parameters CustomersRequest) (CustomersResponse, int, params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -322,15 +319,14 @@ func (c *Client) CustomersCombine(customers []Customer, resultCustomer Customer) } data, status, err := c.PostRequest("/customers/combine", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -379,15 +375,14 @@ func (c *Client) CustomerCreate(customer Customer, site ...string) (CustomerChan fillSite(&p, site) data, status, err := c.PostRequest("/customers/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -423,15 +418,14 @@ func (c *Client) CustomersFixExternalIds(customers []IdentifiersPair) (Successfu } data, status, err := c.PostRequest("/customers/fix-external-ids", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -468,15 +462,14 @@ func (c *Client) CustomersHistory(parameters CustomersHistoryRequest) (Customers params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers/history?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -514,15 +507,14 @@ func (c *Client) CustomerNotes(parameters NotesRequest) (NotesResponse, int, err params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers/notes?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -567,15 +559,14 @@ func (c *Client) CustomerNoteCreate(note Note, site ...string) (CreateResponse, fillSite(&p, site) data, status, err := c.PostRequest("/customers/notes/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -601,19 +592,18 @@ func (c *Client) CustomerNoteDelete(id int) (SuccessfulResponse, int, error) { var resp SuccessfulResponse p := url.Values{ - "id": {string(id)}, + "id": {fmt.Sprint(id)}, } data, status, err := c.PostRequest(fmt.Sprintf("/customers/notes/%d/delete", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -667,15 +657,14 @@ func (c *Client) CustomersUpload(customers []Customer, site ...string) (Customer fillSite(&p, site) data, status, err := c.PostRequest("/customers/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -710,15 +699,14 @@ func (c *Client) Customer(id, by, site string) (CustomerResponse, int, error) { params, _ := query.Values(fw) data, status, err := c.GetRequest(fmt.Sprintf("/customers/%s?%s", id, params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -773,15 +761,14 @@ func (c *Client) CustomerEdit(customer Customer, by string, site ...string) (Cus fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers/%s/edit", uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -819,15 +806,14 @@ func (c *Client) CorporateCustomers(parameters CorporateCustomersRequest) (Corpo params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -868,15 +854,14 @@ func (c *Client) CorporateCustomerCreate(customer CorporateCustomer, site ...str fillSite(&p, site) data, status, err := c.PostRequest("/customers-corporate/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -912,15 +897,14 @@ func (c *Client) CorporateCustomersFixExternalIds(customers []IdentifiersPair) ( } data, status, err := c.PostRequest("/customers-corporate/fix-external-ids", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -957,15 +941,14 @@ func (c *Client) CorporateCustomersHistory(parameters CorporateCustomersHistoryR params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/history?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1003,15 +986,14 @@ func (c *Client) CorporateCustomersNotes(parameters CorporateCustomersNotesReque params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/notes?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1055,15 +1037,14 @@ func (c *Client) CorporateCustomerNoteCreate(note CorporateCustomerNote, site .. fillSite(&p, site) data, status, err := c.PostRequest("/customers-corporate/notes/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1090,19 +1071,18 @@ func (c *Client) CorporateCustomerNoteDelete(id int) (SuccessfulResponse, int, e var resp SuccessfulResponse p := url.Values{ - "id": {string(id)}, + "id": {fmt.Sprint(id)}, } data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/notes/%d/delete", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1150,15 +1130,14 @@ func (c *Client) CorporateCustomersUpload(customers []CorporateCustomer, site .. fillSite(&p, site) data, status, err := c.PostRequest("/customers-corporate/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1193,15 +1172,14 @@ func (c *Client) CorporateCustomer(id, by, site string) (CorporateCustomerRespon params, _ := query.Values(fw) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/%s?%s", id, params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1243,15 +1221,14 @@ func (c *Client) CorporateCustomerAddresses(id string, parameters CorporateCusto params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/%s/addresses?%s", id, params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1294,15 +1271,14 @@ func (c *Client) CorporateCustomerAddressesCreate(id string, by string, address fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/addresses/create", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1364,15 +1340,14 @@ func (c *Client) CorporateCustomerAddressesEdit(customerID, customerBy, entityBy fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/addresses/%s/edit", customerID, uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1414,15 +1389,14 @@ func (c *Client) CorporateCustomerCompanies(id string, parameters IdentifiersPai params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/%s/companies?%s", id, params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1464,15 +1438,14 @@ func (c *Client) CorporateCustomerCompaniesCreate(id string, by string, company fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/companies/create", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1534,15 +1507,14 @@ func (c *Client) CorporateCustomerCompaniesEdit(customerID, customerBy, entityBy fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/companies/%s/edit", customerID, uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1584,15 +1556,14 @@ func (c *Client) CorporateCustomerContacts(id string, parameters IdentifiersPair params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/customers-corporate/%s/contacts?%s", id, params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1639,15 +1610,14 @@ func (c *Client) CorporateCustomerContactsCreate(id string, by string, contact C fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/contacts/create", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1706,15 +1676,14 @@ func (c *Client) CorporateCustomerContactsEdit(customerID, customerBy, entityBy fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/contacts/%s/edit", customerID, uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1769,15 +1738,14 @@ func (c *Client) CorporateCustomerEdit(customer CorporateCustomer, by string, si fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/customers-corporate/%s/edit", uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1824,15 +1792,14 @@ func (c *Client) DeliveryTracking(parameters []DeliveryTrackingRequest, subcode } data, status, err := c.PostRequest(fmt.Sprintf("/delivery/generic/%s/tracking", subcode), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1870,15 +1837,14 @@ func (c *Client) DeliveryShipments(parameters DeliveryShipmentsRequest) (Deliver params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/delivery/shipments?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1927,15 +1893,14 @@ func (c *Client) DeliveryShipmentCreate(shipment DeliveryShipment, deliveryType fillSite(&p, site) data, status, err := c.PostRequest("/delivery/shipments/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -1966,15 +1931,14 @@ func (c *Client) DeliveryShipment(id int) (DeliveryShipmentResponse, int, error) var resp DeliveryShipmentResponse data, status, err := c.GetRequest(fmt.Sprintf("/delivery/shipments/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2014,15 +1978,14 @@ func (c *Client) DeliveryShipmentEdit(shipment DeliveryShipment, site ...string) fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/delivery/shipments/%s/edit", strconv.Itoa(shipment.ID)), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2053,15 +2016,14 @@ func (c *Client) IntegrationModule(code string) (IntegrationModuleResponse, int, var resp IntegrationModuleResponse data, status, err := c.GetRequest(fmt.Sprintf("/integration-modules/%s", code)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2107,15 +2069,14 @@ func (c *Client) IntegrationModuleEdit(integrationModule IntegrationModule) (Int p := url.Values{"integrationModule": {string(updateJSON[:])}} data, status, err := c.PostRequest(fmt.Sprintf("/integration-modules/%s/edit", integrationModule.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2191,15 +2152,14 @@ func (c *Client) OrdersCombine(technique string, order, resultOrder Order) (Oper } data, status, err := c.PostRequest("/orders/combine", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2243,15 +2203,14 @@ func (c *Client) OrderCreate(order Order, site ...string) (OrderCreateResponse, fillSite(&p, site) data, status, err := c.PostRequest("/orders/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2291,15 +2250,14 @@ func (c *Client) OrdersFixExternalIds(orders []IdentifiersPair) (SuccessfulRespo } data, status, err := c.PostRequest("/orders/fix-external-ids", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2332,15 +2290,14 @@ func (c *Client) OrdersHistory(parameters OrdersHistoryRequest) (OrdersHistoryRe params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/orders/history?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2385,15 +2342,14 @@ func (c *Client) OrderPaymentCreate(payment Payment, site ...string) (CreateResp fillSite(&p, site) data, status, err := c.PostRequest("/orders/payments/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2420,19 +2376,18 @@ func (c *Client) OrderPaymentDelete(id int) (SuccessfulResponse, int, error) { var resp SuccessfulResponse p := url.Values{ - "id": {string(id)}, + "id": {fmt.Sprint(id)}, } data, status, err := c.PostRequest(fmt.Sprintf("/orders/payments/%d/delete", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2480,15 +2435,14 @@ func (c *Client) OrderPaymentEdit(payment Payment, by string, site ...string) (S fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/orders/payments/%s/edit", uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2520,15 +2474,14 @@ func (c *Client) OrdersStatuses(request OrdersStatusesRequest) (OrdersStatusesRe params, _ := query.Values(request) data, status, err := c.GetRequest(fmt.Sprintf("/orders/statuses?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2582,15 +2535,14 @@ func (c *Client) OrdersUpload(orders []Order, site ...string) (OrdersUploadRespo fillSite(&p, site) data, status, err := c.PostRequest("/orders/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2681,15 +2633,14 @@ func (c *Client) OrderEdit(order Order, by string, site ...string) (CreateRespon fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/orders/%s/edit", uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2722,15 +2673,14 @@ func (c *Client) Packs(parameters PacksRequest) (PacksResponse, int, error) { params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/orders/packs?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2770,15 +2720,14 @@ func (c *Client) PackCreate(pack Pack) (CreateResponse, int, error) { } data, status, err := c.PostRequest("/orders/packs/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2811,15 +2760,14 @@ func (c *Client) PacksHistory(parameters PacksHistoryRequest) (PacksHistoryRespo params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/orders/packs/history?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2850,15 +2798,14 @@ func (c *Client) Pack(id int) (PackResponse, int, error) { var resp PackResponse data, status, err := c.GetRequest(fmt.Sprintf("/orders/packs/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2885,15 +2832,14 @@ func (c *Client) PackDelete(id int) (SuccessfulResponse, int, error) { var resp SuccessfulResponse data, status, err := c.PostRequest(fmt.Sprintf("/orders/packs/%d/delete", id), url.Values{}) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2926,15 +2872,14 @@ func (c *Client) PackEdit(pack Pack) (CreateResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/orders/packs/%d/edit", pack.ID), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2947,15 +2892,14 @@ func (c *Client) Countries() (CountriesResponse, int, error) { var resp CountriesResponse data, status, err := c.GetRequest("/reference/countries") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -2968,15 +2912,14 @@ func (c *Client) CostGroups() (CostGroupsResponse, int, error) { var resp CostGroupsResponse data, status, err := c.GetRequest("/reference/cost-groups") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3012,15 +2955,14 @@ func (c *Client) CostGroupEdit(costGroup CostGroup) (SuccessfulResponse, int, er } data, status, err := c.PostRequest(fmt.Sprintf("/reference/cost-groups/%s/edit", costGroup.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3033,15 +2975,14 @@ func (c *Client) CostItems() (CostItemsResponse, int, error) { var resp CostItemsResponse data, status, err := c.GetRequest("/reference/cost-items") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3077,15 +3018,14 @@ func (c *Client) CostItemEdit(costItem CostItem) (SuccessfulResponse, int, error } data, status, err := c.PostRequest(fmt.Sprintf("/reference/cost-items/%s/edit", costItem.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3098,15 +3038,14 @@ func (c *Client) Couriers() (CouriersResponse, int, error) { var resp CouriersResponse data, status, err := c.GetRequest("/reference/couriers") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3148,15 +3087,14 @@ func (c *Client) CourierCreate(courier Courier) (CreateResponse, int, error) { } data, status, err := c.PostRequest("/reference/couriers/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3192,15 +3130,14 @@ func (c *Client) CourierEdit(courier Courier) (SuccessfulResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/reference/couriers/%d/edit", courier.ID), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3213,15 +3150,14 @@ func (c *Client) DeliveryServices() (DeliveryServiceResponse, int, error) { var resp DeliveryServiceResponse data, status, err := c.GetRequest("/reference/delivery-services") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3257,15 +3193,14 @@ func (c *Client) DeliveryServiceEdit(deliveryService DeliveryService) (Successfu } data, status, err := c.PostRequest(fmt.Sprintf("/reference/delivery-services/%s/edit", deliveryService.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3278,15 +3213,14 @@ func (c *Client) DeliveryTypes() (DeliveryTypesResponse, int, error) { var resp DeliveryTypesResponse data, status, err := c.GetRequest("/reference/delivery-types") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3324,15 +3258,14 @@ func (c *Client) DeliveryTypeEdit(deliveryType DeliveryType) (SuccessfulResponse } data, status, err := c.PostRequest(fmt.Sprintf("/reference/delivery-types/%s/edit", deliveryType.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3345,15 +3278,14 @@ func (c *Client) LegalEntities() (LegalEntitiesResponse, int, error) { var resp LegalEntitiesResponse data, status, err := c.GetRequest("/reference/legal-entities") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3389,15 +3321,14 @@ func (c *Client) LegalEntityEdit(legalEntity LegalEntity) (SuccessfulResponse, i } data, status, err := c.PostRequest(fmt.Sprintf("/reference/legal-entities/%s/edit", legalEntity.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3410,15 +3341,14 @@ func (c *Client) OrderMethods() (OrderMethodsResponse, int, error) { var resp OrderMethodsResponse data, status, err := c.GetRequest("/reference/order-methods") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3455,15 +3385,14 @@ func (c *Client) OrderMethodEdit(orderMethod OrderMethod) (SuccessfulResponse, i } data, status, err := c.PostRequest(fmt.Sprintf("/reference/order-methods/%s/edit", orderMethod.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3476,15 +3405,14 @@ func (c *Client) OrderTypes() (OrderTypesResponse, int, error) { var resp OrderTypesResponse data, status, err := c.GetRequest("/reference/order-types") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3521,15 +3449,14 @@ func (c *Client) OrderTypeEdit(orderType OrderType) (SuccessfulResponse, int, er } data, status, err := c.PostRequest(fmt.Sprintf("/reference/order-types/%s/edit", orderType.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3542,15 +3469,14 @@ func (c *Client) PaymentStatuses() (PaymentStatusesResponse, int, error) { var resp PaymentStatusesResponse data, status, err := c.GetRequest("/reference/payment-statuses") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3569,15 +3495,14 @@ func (c *Client) PaymentStatusEdit(paymentStatus PaymentStatus) (SuccessfulRespo } data, status, err := c.PostRequest(fmt.Sprintf("/reference/payment-statuses/%s/edit", paymentStatus.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3590,15 +3515,14 @@ func (c *Client) PaymentTypes() (PaymentTypesResponse, int, error) { var resp PaymentTypesResponse data, status, err := c.GetRequest("/reference/payment-types") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3617,15 +3541,14 @@ func (c *Client) PaymentTypeEdit(paymentType PaymentType) (SuccessfulResponse, i } data, status, err := c.PostRequest(fmt.Sprintf("/reference/payment-types/%s/edit", paymentType.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3638,15 +3561,14 @@ func (c *Client) PriceTypes() (PriceTypesResponse, int, error) { var resp PriceTypesResponse data, status, err := c.GetRequest("/reference/price-types") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3665,15 +3587,14 @@ func (c *Client) PriceTypeEdit(priceType PriceType) (SuccessfulResponse, int, er } data, status, err := c.PostRequest(fmt.Sprintf("/reference/price-types/%s/edit", priceType.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3686,15 +3607,14 @@ func (c *Client) ProductStatuses() (ProductStatusesResponse, int, error) { var resp ProductStatusesResponse data, status, err := c.GetRequest("/reference/product-statuses") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3713,15 +3633,14 @@ func (c *Client) ProductStatusEdit(productStatus ProductStatus) (SuccessfulRespo } data, status, err := c.PostRequest(fmt.Sprintf("/reference/product-statuses/%s/edit", productStatus.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3734,15 +3653,14 @@ func (c *Client) Sites() (SitesResponse, int, error) { var resp SitesResponse data, status, err := c.GetRequest("/reference/sites") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3761,15 +3679,14 @@ func (c *Client) SiteEdit(site Site) (SuccessfulResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/reference/sites/%s/edit", site.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3782,15 +3699,14 @@ func (c *Client) StatusGroups() (StatusGroupsResponse, int, error) { var resp StatusGroupsResponse data, status, err := c.GetRequest("/reference/status-groups") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3803,15 +3719,14 @@ func (c *Client) Statuses() (StatusesResponse, int, error) { var resp StatusesResponse data, status, err := c.GetRequest("/reference/statuses") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3819,7 +3734,7 @@ func (c *Client) Statuses() (StatusesResponse, int, error) { // StatusEdit order status create/edit // -// For more information see www.retailcrm.pro/docs/Developers/ApiVersion5#post--api-v5-reference-sites-code-edit +// For more information see www.retailcrm.pro/docs/Developers/ApiVersion5#post--api-v5-reference-sites-code-edit. func (c *Client) StatusEdit(st Status) (SuccessfulResponse, int, error) { var resp SuccessfulResponse @@ -3830,15 +3745,14 @@ func (c *Client) StatusEdit(st Status) (SuccessfulResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/reference/statuses/%s/edit", st.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3851,15 +3765,14 @@ func (c *Client) Stores() (StoresResponse, int, error) { var resp StoresResponse data, status, err := c.GetRequest("/reference/stores") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3878,15 +3791,14 @@ func (c *Client) StoreEdit(store Store) (SuccessfulResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/reference/stores/%s/edit", store.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3899,15 +3811,14 @@ func (c *Client) Units() (UnitsResponse, int, error) { var resp UnitsResponse data, status, err := c.GetRequest("/reference/units") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3926,15 +3837,14 @@ func (c *Client) UnitEdit(unit Unit) (SuccessfulResponse, int, error) { } data, status, err := c.PostRequest(fmt.Sprintf("/reference/units/%s/edit", unit.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -3971,15 +3881,14 @@ func (c *Client) Segments(parameters SegmentsRequest) (SegmentsResponse, int, er params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/segments?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4008,15 +3917,14 @@ func (c *Client) Settings() (SettingsResponse, int, error) { var resp SettingsResponse data, status, err := c.GetRequest("/settings") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4049,15 +3957,14 @@ func (c *Client) Inventories(parameters InventoriesRequest) (InventoriesResponse params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/store/inventories?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4113,15 +4020,14 @@ func (c *Client) InventoriesUpload(inventories []InventoryUpload, site ...string fillSite(&p, site) data, status, err := c.PostRequest("/store/inventories/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4167,15 +4073,14 @@ func (c *Client) PricesUpload(prices []OfferPriceUpload) (StoreUploadResponse, i } data, status, err := c.PostRequest("/store/prices/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4212,15 +4117,14 @@ func (c *Client) ProductsGroup(parameters ProductsGroupsRequest) (ProductsGroups params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/store/product-groups?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4258,15 +4162,14 @@ func (c *Client) Products(parameters ProductsRequest) (ProductsResponse, int, er params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/store/products?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4303,15 +4206,14 @@ func (c *Client) ProductsProperties(parameters ProductsPropertiesRequest) (Produ params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/store/products/properties?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4348,15 +4250,14 @@ func (c *Client) Tasks(parameters TasksRequest) (TasksResponse, int, error) { params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/tasks?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4397,15 +4298,14 @@ func (c *Client) TaskCreate(task Task, site ...string) (CreateResponse, int, err fillSite(&p, site) data, status, err := c.PostRequest("/tasks/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4436,15 +4336,14 @@ func (c *Client) Task(id int) (TaskResponse, int, error) { var resp TaskResponse data, status, err := c.GetRequest(fmt.Sprintf("/tasks/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4483,7 +4382,7 @@ func (c *Client) TaskEdit(task Task, site ...string) (SuccessfulResponse, int, e fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/tasks/%s/edit", uid), p) - if err.Error() != "" { + if err != nil { return resp, status, err } @@ -4524,15 +4423,14 @@ func (c *Client) UserGroups(parameters UserGroupsRequest) (UserGroupsResponse, i params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/user-groups?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4565,15 +4463,14 @@ func (c *Client) Users(parameters UsersRequest) (UsersResponse, int, error) { params, _ := query.Values(parameters) data, status, err := c.GetRequest(fmt.Sprintf("/users?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4604,15 +4501,14 @@ func (c *Client) User(id int) (UserResponse, int, error) { var resp UserResponse data, status, err := c.GetRequest(fmt.Sprintf("/users/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4643,15 +4539,14 @@ func (c *Client) UserStatus(id int, status string) (SuccessfulResponse, int, err } data, st, err := c.PostRequest(fmt.Sprintf("/users/%d/status", id), p) - if err.Error() != "" { + if err != nil { return resp, st, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, st, err + return resp, st, NewApiError(data) } return resp, st, nil @@ -4664,15 +4559,14 @@ func (c *Client) StaticticsUpdate() (SuccessfulResponse, int, error) { var resp SuccessfulResponse data, status, err := c.GetRequest("/statistic/update") - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4711,15 +4605,14 @@ func (c *Client) Costs(costs CostsRequest) (CostsResponse, int, error) { data, status, err := c.GetRequest(fmt.Sprintf("/costs?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4770,15 +4663,14 @@ func (c *Client) CostCreate(cost CostRecord, site ...string) (CreateResponse, in fillSite(&p, site) data, status, err := c.PostRequest("/costs/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4815,15 +4707,14 @@ func (c *Client) CostsDelete(ids []int) (CostsDeleteResponse, int, error) { } data, status, err := c.PostRequest("/costs/delete", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4877,15 +4768,14 @@ func (c *Client) CostsUpload(cost []CostRecord) (CostsUploadResponse, int, error } data, status, err := c.PostRequest("/costs/upload", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4917,15 +4807,14 @@ func (c *Client) Cost(id int) (CostResponse, int, error) { data, status, err := c.GetRequest(fmt.Sprintf("/costs/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -4959,15 +4848,14 @@ func (c *Client) CostDelete(id int) (SuccessfulResponse, int, error) { data, status, err := c.PostRequest(fmt.Sprintf("/costs/%d/delete", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5011,15 +4899,14 @@ func (c *Client) CostEdit(id int, cost CostRecord, site ...string) (CreateRespon fillSite(&p, site) data, status, err := c.PostRequest(fmt.Sprintf("/costs/%d/edit", id), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5060,8 +4947,7 @@ func (c *Client) Files(files FilesRequest) (FilesResponse, int, error) { json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5101,8 +4987,7 @@ func (c *Client) FileUpload(reader io.Reader) (FileUploadResponse, int, error) { json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5133,15 +5018,14 @@ func (c *Client) File(id int) (FileResponse, int, error) { var resp FileResponse data, status, err := c.GetRequest(fmt.Sprintf("/files/%d", id)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5176,8 +5060,7 @@ func (c *Client) FileDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5242,8 +5125,7 @@ func (c *Client) FileEdit(id int, file File) (FileResponse, int, error) { json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5280,15 +5162,14 @@ func (c *Client) CustomFields(customFields CustomFieldsRequest) (CustomFieldsRes data, status, err := c.GetRequest(fmt.Sprintf("/custom-fields?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5326,15 +5207,14 @@ func (c *Client) CustomDictionaries(customDictionaries CustomDictionariesRequest data, status, err := c.GetRequest(fmt.Sprintf("/custom-fields/dictionaries?%s", params.Encode())) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5385,15 +5265,14 @@ func (c *Client) CustomDictionariesCreate(customDictionary CustomDictionary) (Cu data, status, err := c.PostRequest("/custom-fields/dictionaries/create", p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5425,15 +5304,14 @@ func (c *Client) CustomDictionary(code string) (CustomDictionaryResponse, int, e data, status, err := c.GetRequest(fmt.Sprintf("/custom-fields/dictionaries/%s", code)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5483,15 +5361,14 @@ func (c *Client) CustomDictionaryEdit(customDictionary CustomDictionary) (Custom } data, status, err := c.PostRequest(fmt.Sprintf("/custom-fields/dictionaries/%s/edit", customDictionary.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5535,15 +5412,14 @@ func (c *Client) CustomFieldsCreate(customFields CustomFields) (CustomResponse, data, status, err := c.PostRequest(fmt.Sprintf("/custom-fields/%s/create", customFields.Entity), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5575,15 +5451,14 @@ func (c *Client) CustomField(entity, code string) (CustomFieldResponse, int, err data, status, err := c.GetRequest(fmt.Sprintf("/custom-fields/%s/%s", entity, code)) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil @@ -5625,15 +5500,14 @@ func (c *Client) CustomFieldEdit(customFields CustomFields) (CustomResponse, int data, status, err := c.PostRequest(fmt.Sprintf("/custom-fields/%s/%s/edit", customFields.Entity, customFields.Code), p) - if err.Error() != "" { + if err != nil { return resp, status, err } json.Unmarshal(data, &resp) if resp.Success == false { - //buildErr(data, err) - return resp, status, err + return resp, status, NewApiError(data) } return resp, status, nil diff --git a/v5/client_test.go b/v5/client_test.go index 5cce145..0dd7fc3 100644 --- a/v5/client_test.go +++ b/v5/client_test.go @@ -113,16 +113,16 @@ func TestClient_ApiVersionsVersions(t *testing.T) { BodyString(`{"success": true, "versions" : ["1.0", "4.0", "3.0", "4.0", "5.0"]}`) data, status, err := c.APIVersions() - if err.Error() != "" { + if err != nil { t.Errorf("%v", err.Error()) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -137,16 +137,16 @@ func TestClient_ApiVersionsVersionsBadUrl(t *testing.T) { BodyString(`{"success": false, "errorMsg" : "Account does not exist"}`) data, status, err := c.APIVersions() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != false { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } } @@ -161,16 +161,16 @@ func TestClient_ApiCredentialsCredentialsBadKey(t *testing.T) { c := client() data, status, err := c.APICredentials() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } if data.Success != false { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } } @@ -185,16 +185,16 @@ func TestClient_ApiCredentialsCredentials(t *testing.T) { c := client() data, status, err := c.APICredentials() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -217,16 +217,16 @@ func TestClient_CustomersCustomers(t *testing.T) { Page: 3, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } if data.Success != true { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } } @@ -247,8 +247,8 @@ func TestClient_CustomersCustomers_Fail(t *testing.T) { }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -296,16 +296,16 @@ func TestClient_CustomerChange(t *testing.T) { BodyString(`{"success": true, "id": 123}`) cr, sc, err := c.CustomerCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if sc != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cr.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } f.ID = cr.ID @@ -326,16 +326,16 @@ func TestClient_CustomerChange(t *testing.T) { BodyString(`{"success": true}`) ed, se, err := c.CustomerEdit(f, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if se != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if ed.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -361,20 +361,20 @@ func TestClient_CustomerChange(t *testing.T) { }`) data, status, err := c.Customer(f.ExternalID, ByExternalID, "") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if !reflect.DeepEqual(data.Customer.Tags, f.Tags) { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -401,8 +401,8 @@ func TestClient_CustomerChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Parameter 'externalId' in 'customer' is missing"}`) cr, sc, err := c.CustomerCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if sc < http.StatusBadRequest { @@ -431,8 +431,8 @@ func TestClient_CustomerChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) ed, se, err := c.CustomerEdit(f, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if se < http.StatusBadRequest { @@ -450,8 +450,8 @@ func TestClient_CustomerChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) data, status, err := c.Customer(codeFail, ByExternalID, "") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -492,16 +492,16 @@ func TestClient_CustomersUpload(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.CustomersUpload(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -525,8 +525,8 @@ func TestClient_CustomersUpload_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Customers are loaded with errors"}`) data, status, err := c.CustomersUpload(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -562,16 +562,16 @@ func TestClient_CustomersCombine(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.CustomersCombine(customers, resultCustomer) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -599,8 +599,8 @@ func TestClient_CustomersCombine_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) data, status, err := c.CustomersCombine([]Customer{{}, {}}, Customer{}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -636,16 +636,16 @@ func TestClient_CustomersFixExternalIds(t *testing.T) { BodyString(`{"success": true}`) fx, fe, err := c.CustomersFixExternalIds(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if fe != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if fx.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -670,8 +670,8 @@ func TestClient_CustomersFixExternalIds_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"id": "ID must be an integer"}}`) data, status, err := c.CustomersFixExternalIds(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -699,16 +699,16 @@ func TestClient_CustomersHistory(t *testing.T) { BodyString(`{"success": true, "history": [{"id": 1}]}`) data, status, err := c.CustomersHistory(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.History) == 0 { @@ -733,8 +733,8 @@ func TestClient_CustomersHistory_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) data, status, err := c.CustomersHistory(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -765,16 +765,16 @@ func TestClient_CorporateCustomersList(t *testing.T) { Page: 3, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } if data.Success != true { - t.Logf("%v", err.ApiError()) + t.Logf("%v", err) } } @@ -861,16 +861,16 @@ func TestClient_CorporateCustomersCreate(t *testing.T) { data, status, err := c.CorporateCustomerCreate(customer, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -898,16 +898,16 @@ func TestClient_CorporateCustomersFixExternalIds(t *testing.T) { BodyString(`{"success": true}`) fx, fe, err := c.CorporateCustomersFixExternalIds(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if fe != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if fx.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -932,8 +932,8 @@ func TestClient_CorporateCustomersFixExternalIds_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"id": "ID must be an integer"}}`) data, status, err := c.CorporateCustomersFixExternalIds(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -961,16 +961,16 @@ func TestClient_CorporateCustomersHistory(t *testing.T) { BodyString(`{"success": true, "history": [{"id": 1}]}`) data, status, err := c.CorporateCustomersHistory(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.History) == 0 { @@ -995,8 +995,8 @@ func TestClient_CorporateCustomersHistory_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) data, status, err := c.CorporateCustomersHistory(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -1049,16 +1049,16 @@ func TestClient_CorporateCustomersNotes(t *testing.T) { }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Notes[0].Text != "

sample text

" { @@ -1083,16 +1083,16 @@ func TestClient_CorporateCustomerNoteCreate(t *testing.T) { }, }, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.ID != 1 { @@ -1112,16 +1112,16 @@ func TestClient_CorporateCustomerNoteDelete(t *testing.T) { data, status, err := c.CorporateCustomerNoteDelete(1) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1152,16 +1152,16 @@ func TestClient_CorporateCustomersUpload(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.CorporateCustomersUpload(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1185,8 +1185,8 @@ func TestClient_CorporateCustomersUpload_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Customers are loaded with errors"}`) data, status, err := c.CorporateCustomersUpload(customers) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -1242,16 +1242,16 @@ func TestClient_CorporateCustomer(t *testing.T) { `) data, status, err := c.CorporateCustomer("ext-id", ByExternalID, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1301,16 +1301,16 @@ func TestClient_CorporateCustomerAddresses(t *testing.T) { Page: 1, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.Addresses) == 0 { @@ -1333,16 +1333,16 @@ func TestClient_CorporateCustomerAddressesCreate(t *testing.T) { Name: "New Address", }, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1367,16 +1367,16 @@ func TestClient_CorporateCustomerAddressesEdit(t *testing.T) { "site", ) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1462,16 +1462,16 @@ func TestClient_CorporateCustomerCompanies(t *testing.T) { Page: 1, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.Companies) == 0 { @@ -1493,16 +1493,16 @@ func TestClient_CorporateCustomerCompaniesCreate(t *testing.T) { Name: "New Company", }, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1527,16 +1527,16 @@ func TestClient_CorporateCustomerCompaniesEdit(t *testing.T) { "site", ) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1578,16 +1578,16 @@ func TestClient_CorporateCustomerContacts(t *testing.T) { Page: 1, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.Contacts) == 0 { @@ -1616,16 +1616,16 @@ func TestClient_CorporateCustomerContactsCreate(t *testing.T) { LastName: "Person", }, "site") - if createErr.Error() != "" { - t.Errorf("%v", createErr.Error()) + if createErr != nil { + t.Errorf("%v", createErr) } if createStatus >= http.StatusBadRequest { - t.Errorf("%v", createErr.ApiError()) + t.Errorf("%v", createErr) } if createResponse.Success != true { - t.Errorf("%v", createErr.ApiError()) + t.Errorf("%v", createErr) } if createResponse.ID != 2 { @@ -1641,16 +1641,16 @@ func TestClient_CorporateCustomerContactsCreate(t *testing.T) { Companies: []IdentifiersPair{}, }, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.ID != 3 { @@ -1675,16 +1675,16 @@ func TestClient_CorporateCustomerContactsEdit(t *testing.T) { }, }, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("(%d) %v", status, err.ApiError()) + t.Errorf("(%d) %v", status, err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.ID == 0 { @@ -1708,16 +1708,16 @@ func TestClient_CorporateCustomerEdit(t *testing.T) { Vip: true, }, ByExternalID, "site") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("(%d) %v", status, err.ApiError()) + t.Errorf("(%d) %v", status, err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1733,20 +1733,20 @@ func TestClient_NotesNotes(t *testing.T) { BodyString(`{"success": true, "notes": [{"id": 1}]}`) data, status, err := c.CustomerNotes(NotesRequest{Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.Notes) == 0 { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1764,8 +1764,8 @@ func TestClient_NotesNotes_Fail(t *testing.T) { data, status, err := c.CustomerNotes(NotesRequest{ Filter: NotesFilter{CreatedAtFrom: "2020-13-12"}, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -1804,20 +1804,20 @@ func TestClient_NotesCreateDelete(t *testing.T) { BodyString(`{"success": true, "id": 1}`) noteCreateResponse, noteCreateStatus, err := c.CustomerNoteCreate(note) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if noteCreateStatus != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if noteCreateResponse.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } p = url.Values{ - "id": {string(1)}, + "id": {fmt.Sprint(1)}, } gock.New(crmURL). @@ -1828,17 +1828,17 @@ func TestClient_NotesCreateDelete(t *testing.T) { BodyString(`{"success": true}`) noteDeleteResponse, noteDeleteStatus, err := c.CustomerNoteDelete(noteCreateResponse.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if noteDeleteStatus != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if noteDeleteResponse.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1866,8 +1866,8 @@ func TestClient_NotesCreateDelete_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the entity format", "errors": {"customer": "Set one of the following fields: id, externalId"}}`) data, status, err := c.CustomerNoteCreate(note) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -1879,7 +1879,7 @@ func TestClient_NotesCreateDelete_Fail(t *testing.T) { } p = url.Values{ - "id": {string(iCodeFail)}, + "id": {fmt.Sprint(iCodeFail)}, } gock.New(crmURL). @@ -1890,8 +1890,8 @@ func TestClient_NotesCreateDelete_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Note not found map"}`) noteDeleteResponse, noteDeleteStatus, err := c.CustomerNoteDelete(iCodeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if noteDeleteStatus < http.StatusBadRequest { @@ -1916,17 +1916,17 @@ func TestClient_OrdersOrders(t *testing.T) { BodyString(`{"success": true, "orders": [{"id": 1}]}`) data, status, err := c.Orders(OrdersRequest{Filter: OrdersFilter{City: "Москва"}, Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -1942,8 +1942,8 @@ func TestClient_OrdersOrders_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[attachments]": "SThis value is not valid."}}`) data, status, err := c.Orders(OrdersRequest{Filter: OrdersFilter{Attachments: 7}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2060,16 +2060,16 @@ func TestClient_OrderChange(t *testing.T) { }`) cr, sc, err := c.OrderCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if sc != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cr.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cr.Order.Number != "1A" { @@ -2094,16 +2094,16 @@ func TestClient_OrderChange(t *testing.T) { BodyString(`{"success": true}`) ed, se, err := c.OrderEdit(f, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if se != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if ed.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -2113,16 +2113,16 @@ func TestClient_OrderChange(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.Order(f.ExternalID, ByExternalID, "") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2157,8 +2157,8 @@ func TestClient_OrderChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found map"}`) data, status, err := c.OrderEdit(f, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2199,17 +2199,17 @@ func TestClient_OrdersUpload(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.OrdersUpload(orders) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2241,8 +2241,8 @@ func TestClient_OrdersUpload_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Orders are loaded with errors"}`) data, status, err := c.OrdersUpload(orders) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2275,17 +2275,17 @@ func TestClient_OrdersCombine(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.OrdersCombine("ours", Order{ID: 1}, Order{ID: 2}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2309,10 +2309,9 @@ func TestClient_OrdersCombine_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) data, status, err := c.OrdersCombine("ours", Order{}, Order{}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } - if status < http.StatusBadRequest { t.Error(statusFail) } @@ -2345,17 +2344,17 @@ func TestClient_OrdersFixExternalIds(t *testing.T) { BodyString(`{"success": true}`) fx, fe, err := c.OrdersFixExternalIds(orders) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if fe != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if fx.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2378,8 +2377,8 @@ func TestClient_OrdersFixExternalIds_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) data, status, err := c.OrdersFixExternalIds(orders) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2423,20 +2422,20 @@ func TestClient_OrdersStatuses(t *testing.T) { IDs: []int{1}, ExternalIDs: []string{"2"}, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.Orders) == 0 { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2452,21 +2451,21 @@ func TestClient_OrdersHistory(t *testing.T) { BodyString(`{"success": true, "history": [{"id": 1}]}`) data, status, err := c.OrdersHistory(OrdersHistoryRequest{Filter: OrdersHistoryFilter{SinceID: 20}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.History) == 0 { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2482,8 +2481,8 @@ func TestClient_OrdersHistory_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) data, status, err := c.OrdersHistory(OrdersHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2521,16 +2520,16 @@ func TestClient_PaymentCreateEditDelete(t *testing.T) { BodyString(`{"success": true, "id": 1}`) paymentCreateResponse, status, err := c.OrderPaymentCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if paymentCreateResponse.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } k := Payment{ @@ -2551,20 +2550,20 @@ func TestClient_PaymentCreateEditDelete(t *testing.T) { BodyString(`{"success": true}`) paymentEditResponse, status, err := c.OrderPaymentEdit(k, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if paymentEditResponse.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } p = url.Values{ - "id": {string(paymentCreateResponse.ID)}, + "id": {fmt.Sprint(paymentCreateResponse.ID)}, } gock.New(crmURL). @@ -2575,16 +2574,16 @@ func TestClient_PaymentCreateEditDelete(t *testing.T) { BodyString(`{"success": true}`) paymentDeleteResponse, status, err := c.OrderPaymentDelete(paymentCreateResponse.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if paymentDeleteResponse.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2612,8 +2611,8 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the entity format", "errors": {"order": "Set one of the following fields: id, externalId, number"}}`) data, status, err := c.OrderPaymentCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2642,8 +2641,8 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Payment not found"}`) paymentEditResponse, status, err := c.OrderPaymentEdit(k, ByID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2655,7 +2654,7 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { } p = url.Values{ - "id": {string(iCodeFail)}, + "id": {fmt.Sprint(iCodeFail)}, } gock.New(crmURL). @@ -2666,8 +2665,8 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Payment not found"}`) paymentDeleteResponse, status, err := c.OrderPaymentDelete(iCodeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2698,16 +2697,16 @@ func TestClient_TasksTasks(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.Tasks(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2728,8 +2727,8 @@ func TestClient_TasksTasks_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.Tasks(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2763,16 +2762,16 @@ func TestClient_TaskChange(t *testing.T) { BodyString(`{"success": true, "id": 1}`) cr, sc, err := c.TaskCreate(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if sc != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cr.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } f.ID = cr.ID @@ -2784,16 +2783,16 @@ func TestClient_TaskChange(t *testing.T) { BodyString(`{"success": true}`) gt, sg, err := c.Task(f.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if sg != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if gt.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } jr, _ = json.Marshal(f) @@ -2809,17 +2808,17 @@ func TestClient_TaskChange(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.TaskEdit(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2846,8 +2845,8 @@ func TestClient_TaskChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Task is not loaded", "errors": {"performerId": "This value should not be blank."}}`) data, status, err := c.TaskEdit(f) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2872,17 +2871,17 @@ func TestClient_UsersUsers(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.Users(UsersRequest{Filter: UsersFilter{Active: 1}, Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2899,8 +2898,8 @@ func TestClient_UsersUsers_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"active": "he value you selected is not a valid choice."}}`) data, status, err := c.Users(UsersRequest{Filter: UsersFilter{Active: 3}, Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2923,17 +2922,17 @@ func TestClient_UsersUser(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.User(user) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -2948,8 +2947,8 @@ func TestClient_UsersUser_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) data, status, err := c.User(iCodeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -2973,16 +2972,16 @@ func TestClient_UsersGroups(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.UserGroups(UserGroupsRequest{Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3003,17 +3002,16 @@ func TestClient_UsersUpdate(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.UserStatus(user, "busy") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3034,8 +3032,8 @@ func TestClient_UsersUpdate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) data, status, err := c.UserStatus(iCodeFail, "busy") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -3058,16 +3056,16 @@ func TestClient_StaticticsUpdate(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.StaticticsUpdate() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3082,16 +3080,16 @@ func TestClient_Countries(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.Couriers() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3106,16 +3104,16 @@ func TestClient_CostGroups(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.CostGroups() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3130,16 +3128,16 @@ func TestClient_CostItems(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.CostItems() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3154,16 +3152,16 @@ func TestClient_Couriers(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.Couriers() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3178,16 +3176,16 @@ func TestClient_DeliveryService(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.DeliveryServices() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3202,16 +3200,16 @@ func TestClient_DeliveryTypes(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.DeliveryTypes() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3226,16 +3224,16 @@ func TestClient_LegalEntities(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.LegalEntities() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3250,16 +3248,16 @@ func TestClient_OrderMethods(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.OrderMethods() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3285,16 +3283,16 @@ func TestClient_OrderPaymentEdit(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.OrderPaymentEdit(payment, "externalId") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3309,16 +3307,16 @@ func TestClient_OrderTypes(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.OrderTypes() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3333,16 +3331,16 @@ func TestClient_PaymentStatuses(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PaymentStatuses() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3357,16 +3355,16 @@ func TestClient_PaymentTypes(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PaymentTypes() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3381,16 +3379,16 @@ func TestClient_PriceTypes(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PriceTypes() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3405,16 +3403,16 @@ func TestClient_ProductStatuses(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.ProductStatuses() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3429,16 +3427,16 @@ func TestClient_Statuses(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.Statuses() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3453,16 +3451,16 @@ func TestClient_StatusGroups(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.StatusGroups() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3477,16 +3475,16 @@ func TestClient_Sites(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.Sites() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3501,16 +3499,16 @@ func TestClient_Stores(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.Stores() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3542,16 +3540,16 @@ func TestClient_CostGroupItemEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.CostGroupEdit(costGroup) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } costItem := CostItem{ @@ -3577,17 +3575,17 @@ func TestClient_CostGroupItemEdit(t *testing.T) { BodyString(`{"success": true}`) idata, st, err := c.CostItemEdit(costItem) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if idata.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3617,8 +3615,8 @@ func TestClient_CostGroupItemEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.CostGroupEdit(costGroup) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -3652,8 +3650,8 @@ func TestClient_CostGroupItemEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) idata, st, err := c.CostItemEdit(costItem) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -3691,16 +3689,16 @@ func TestClient_Courier(t *testing.T) { BodyString(`{"success": true, "id": 1}`) data, st, err := c.CourierCreate(cur) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } cur.ID = data.ID @@ -3720,17 +3718,17 @@ func TestClient_Courier(t *testing.T) { BodyString(`{"success": true}`) idata, st, err := c.CourierEdit(cur) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if idata.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3753,8 +3751,8 @@ func TestClient_Courier_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the entity format", "errors": {"firstName": "Specify the first name"}}`) data, st, err := c.CourierCreate(Courier{}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -3780,8 +3778,8 @@ func TestClient_Courier_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "An attempt was made to edit a nonexistent record"}`) idata, st, err := c.CourierEdit(cur) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -3818,17 +3816,17 @@ func TestClient_DeliveryServiceEdit(t *testing.T) { BodyString(`{"success": true, "id": 1}`) data, st, err := c.DeliveryServiceEdit(deliveryService) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3855,8 +3853,8 @@ func TestClient_DeliveryServiceEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.DeliveryServiceEdit(deliveryService) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -3898,17 +3896,17 @@ func TestClient_DeliveryTypeEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.DeliveryTypeEdit(deliveryType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -3939,8 +3937,8 @@ func TestClient_DeliveryTypeEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.DeliveryTypeEdit(deliveryType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -3977,17 +3975,17 @@ func TestClient_OrderMethodEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.OrderMethodEdit(orderMethod) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4015,8 +4013,8 @@ func TestClient_OrderMethodEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.OrderMethodEdit(orderMethod) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4054,17 +4052,17 @@ func TestClient_OrderTypeEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.OrderTypeEdit(orderType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4091,8 +4089,8 @@ func TestClient_OrderTypeEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.OrderTypeEdit(orderType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4132,17 +4130,17 @@ func TestClient_PaymentStatusEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PaymentStatusEdit(paymentStatus) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4172,8 +4170,8 @@ func TestClient_PaymentStatusEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.PaymentStatusEdit(paymentStatus) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4210,17 +4208,17 @@ func TestClient_PaymentTypeEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PaymentTypeEdit(paymentType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4248,8 +4246,8 @@ func TestClient_PaymentTypeEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.PaymentTypeEdit(paymentType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4285,16 +4283,16 @@ func TestClient_PriceTypeEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.PriceTypeEdit(priceType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4321,8 +4319,8 @@ func TestClient_PriceTypeEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.PriceTypeEdit(priceType) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4359,16 +4357,16 @@ func TestClient_ProductStatusEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.ProductStatusEdit(productStatus) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4396,8 +4394,8 @@ func TestClient_ProductStatusEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.ProductStatusEdit(productStatus) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4434,17 +4432,17 @@ func TestClient_StatusEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.StatusEdit(status) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4473,8 +4471,8 @@ func TestClient_StatusEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.StatusEdit(status) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4511,12 +4509,12 @@ func TestClient_SiteEdit(t *testing.T) { BodyString(`{"success": true}`) data, _, err := c.SiteEdit(site) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if data.Success == false { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4545,8 +4543,8 @@ func TestClient_SiteEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Method Not Allowed"}`) data, _, err := c.SiteEdit(site) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if data.Success != false { @@ -4581,16 +4579,16 @@ func TestClient_StoreEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.StoreEdit(store) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4620,8 +4618,8 @@ func TestClient_StoreEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) data, st, err := c.StoreEdit(store) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4644,16 +4642,16 @@ func TestClient_Units(t *testing.T) { BodyString(`{"success": true, "units": []}`) data, st, err := c.Units() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if st != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4684,16 +4682,16 @@ func TestClient_UnitsEdit(t *testing.T) { BodyString(`{"success": true}`) data, st, err := c.UnitEdit(unit) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[st] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4721,8 +4719,8 @@ func TestClient_UnitEdit_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Method not found"}`) data, st, err := c.UnitEdit(unit) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if st < http.StatusBadRequest { @@ -4758,16 +4756,16 @@ func TestClient_PackChange(t *testing.T) { BodyString(`{"success": true, "id": 1}`) p, status, err := c.PackCreate(pack) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if p.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -4776,16 +4774,16 @@ func TestClient_PackChange(t *testing.T) { BodyString(`{"success": true}`) s, status, err := c.Pack(p.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if s.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } jr, _ = json.Marshal(&Pack{ID: p.ID, Quantity: 2}) @@ -4802,16 +4800,16 @@ func TestClient_PackChange(t *testing.T) { BodyString(`{"success": true}`) e, status, err := c.PackEdit(Pack{ID: p.ID, Quantity: 2}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if e.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -4821,16 +4819,16 @@ func TestClient_PackChange(t *testing.T) { BodyString(`{"success": true}`) d, status, err := c.PackDelete(p.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if d.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4859,8 +4857,8 @@ func TestClient_PackChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the entity format"}`) p, status, err := c.PackCreate(pack) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -4877,8 +4875,8 @@ func TestClient_PackChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the entity format"}`) s, status, err := c.Pack(iCodeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -4903,8 +4901,8 @@ func TestClient_PackChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Pack with id 123123 not found"}`) e, status, err := c.PackEdit(Pack{ID: iCodeFail, Quantity: 2}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -4922,8 +4920,8 @@ func TestClient_PackChange_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Pack not found"}`) d, status, err := c.PackDelete(iCodeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -4947,21 +4945,21 @@ func TestClient_PacksHistory(t *testing.T) { BodyString(`{"success": true, "history": [{"id": 1}]}`) data, status, err := c.PacksHistory(PacksHistoryRequest{Filter: OrdersHistoryFilter{SinceID: 5}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if len(data.History) == 0 { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -4977,8 +4975,8 @@ func TestClient_PacksHistory_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.PacksHistory(PacksHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5002,17 +5000,17 @@ func TestClient_Packs(t *testing.T) { BodyString(`{"success": true}`) data, status, err := c.Packs(PacksRequest{Filter: PacksFilter{}, Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5028,8 +5026,8 @@ func TestClient_Packs_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.Packs(PacksRequest{Filter: PacksFilter{ShipmentDateFrom: "2020-13-12"}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5054,17 +5052,17 @@ func TestClient_Inventories(t *testing.T) { BodyString(`{"success": true, "id": 1}`) data, status, err := c.Inventories(InventoriesRequest{Filter: InventoriesFilter{Details: 1}, Page: 1}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5080,8 +5078,8 @@ func TestClient_Inventories_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.Inventories(InventoriesRequest{Filter: InventoriesFilter{Sites: []string{codeFail}}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5104,17 +5102,17 @@ func TestClient_Segments(t *testing.T) { BodyString(`{"success": true, "id": 1}`) data, status, err := c.Segments(SegmentsRequest{}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5146,16 +5144,16 @@ func TestClient_Settings(t *testing.T) { `) data, status, err := c.Settings() - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status >= http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Settings.DefaultCurrency.Value != "RUB" { @@ -5183,8 +5181,8 @@ func TestClient_Segments_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.Segments(SegmentsRequest{Filter: SegmentsFilter{Active: 3}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5229,16 +5227,16 @@ func TestClient_IntegrationModule(t *testing.T) { BodyString(`{"success": true}`) m, status, err := c.IntegrationModuleEdit(integrationModule) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusCreated { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if m.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -5247,16 +5245,16 @@ func TestClient_IntegrationModule(t *testing.T) { BodyString(`{"success": true}`) g, status, err := c.IntegrationModule(code) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5292,8 +5290,8 @@ func TestClient_IntegrationModule_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) m, status, err := c.IntegrationModuleEdit(integrationModule) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5310,8 +5308,8 @@ func TestClient_IntegrationModule_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) g, status, err := c.IntegrationModule(code) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5339,17 +5337,17 @@ func TestClient_ProductsGroup(t *testing.T) { Active: 1, }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5369,8 +5367,8 @@ func TestClient_ProductsGroup_Fail(t *testing.T) { Active: 3, }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5400,17 +5398,17 @@ func TestClient_Products(t *testing.T) { MinPrice: 1, }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5428,8 +5426,8 @@ func TestClient_Products_Fail(t *testing.T) { g, status, err := c.Products(ProductsRequest{ Filter: ProductsFilter{Active: 3}, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5460,16 +5458,16 @@ func TestClient_ProductsProperties(t *testing.T) { Sites: sites, }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5497,16 +5495,16 @@ func TestClient_DeliveryTracking(t *testing.T) { }}, }}, "subcode") - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5526,16 +5524,16 @@ func TestClient_DeliveryShipments(t *testing.T) { DateFrom: "2017-10-10", }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if g.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5555,8 +5553,8 @@ func TestClient_DeliveryShipments_Fail(t *testing.T) { Stores: []string{codeFail}, }, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { @@ -5595,16 +5593,16 @@ func TestClient_Cost(t *testing.T) { data, status, err := c.CostCreate(costRecord) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } id := data.ID @@ -5625,16 +5623,16 @@ func TestClient_Cost(t *testing.T) { Page: 1, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if costs.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -5644,16 +5642,16 @@ func TestClient_Cost(t *testing.T) { cost, status, err := c.Cost(id) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cost.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } costRecord.DateFrom = "2018-04-09" @@ -5675,16 +5673,16 @@ func TestClient_Cost(t *testing.T) { costEdit, status, err := c.CostEdit(id, costRecord) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if costEdit.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } j, _ := json.Marshal(&id) @@ -5702,16 +5700,16 @@ func TestClient_Cost(t *testing.T) { costDelete, status, err := c.CostDelete(id) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if costDelete.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5741,16 +5739,16 @@ func TestClient_Cost_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Cost is not loaded"}`) data, status, err := c.CostCreate(costRecord) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Error("Error must be return") } if status < http.StatusBadRequest { t.Error(statusFail) } - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } id := data.ID @@ -5764,8 +5762,8 @@ func TestClient_Cost_Fail(t *testing.T) { costs, status, err := c.Costs(CostsRequest{ Filter: CostsFilter{Sites: []string{codeFail}}, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -5782,8 +5780,8 @@ func TestClient_Cost_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) cost, status, err := c.Cost(id) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -5813,8 +5811,8 @@ func TestClient_Cost_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Cost is not loaded"}`) costEdit, status, err := c.CostEdit(id, costRecord) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -5838,8 +5836,8 @@ func TestClient_Cost_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) costDelete, status, err := c.CostDelete(id) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -5891,17 +5889,17 @@ func TestClient_CostsUpload(t *testing.T) { data, status, err := c.CostsUpload(costsUpload) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } ids := data.UploadedCosts @@ -5920,17 +5918,17 @@ func TestClient_CostsUpload(t *testing.T) { BodyString(`{"success": true}`) costsDelete, status, err := c.CostsDelete(ids) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if costsDelete.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -5965,8 +5963,8 @@ func TestClient_CostsUpload_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Costs are loaded with errors"}`) data, status, err := c.CostsUpload(costsUpload) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -5993,8 +5991,8 @@ func TestClient_CostsUpload_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Expected array, but got NULL: null"}`) costsDelete, status, err := c.CostsDelete(ids) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -6029,7 +6027,7 @@ func TestClient_Files(t *testing.T) { }) if status != 200 { - t.Errorf("%v %v", err.Error(), err.ApiError()) + t.Errorf("%v %v", err.Error(), err) } } @@ -6045,16 +6043,16 @@ func TestClient_FileUpload(t *testing.T) { BodyString(`{"success": true, "file": {"id": 1}}`) data, status, err := c.FileUpload(file) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.File.ID != 1 { @@ -6074,8 +6072,8 @@ func TestClient_FileUploadFail(t *testing.T) { BodyString(`{"success":false,"errorMsg":"Your account doesn't have enough money to upload files."}`) _, status, err := c.FileUpload(file) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status != http.StatusBadRequest { @@ -6115,16 +6113,16 @@ func TestClient_File(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not Found"}`) s, status, err := c.File(fileResponse.File.ID) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if s.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if s.File.ID != fileResponse.File.ID { @@ -6132,8 +6130,8 @@ func TestClient_File(t *testing.T) { } s, status, err = c.File(invalidFile) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status != http.StatusNotFound { @@ -6165,21 +6163,21 @@ func TestClient_FileDelete(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not Found"}`) data, status, err := c.FileDelete(successful) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } data, status, err = c.FileDelete(badRequest) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status != http.StatusBadRequest { @@ -6187,8 +6185,8 @@ func TestClient_FileDelete(t *testing.T) { } data, status, err = c.FileDelete(notFound) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status != http.StatusNotFound { @@ -6215,12 +6213,12 @@ func TestClient_FileDownload(t *testing.T) { BodyString("") data, status, err := c.FileDownload(successful) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } fetchedByte, errr := ioutil.ReadAll(data) @@ -6234,8 +6232,8 @@ func TestClient_FileDownload(t *testing.T) { } data, status, err = c.FileDownload(fail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusBadRequest { @@ -6266,16 +6264,16 @@ func TestClient_FileEdit(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not Found"}`) data, status, err := c.FileEdit(successful, *resp.File) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if status != http.StatusOK { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.File.Filename != resp.File.Filename { @@ -6300,16 +6298,16 @@ func TestClient_CustomFields(t *testing.T) { data, status, err := c.CustomFields(CustomFieldsRequest{}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -6325,8 +6323,8 @@ func TestClient_CustomFields_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.CustomFields(CustomFieldsRequest{Filter: CustomFieldsFilter{Type: codeFail}}) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -6371,16 +6369,16 @@ func TestClient_CustomDictionariesCreate(t *testing.T) { data, status, err := c.CustomDictionariesCreate(customDictionary) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -6399,17 +6397,17 @@ func TestClient_CustomDictionariesCreate(t *testing.T) { Page: 1, }) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cds.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -6419,12 +6417,12 @@ func TestClient_CustomDictionariesCreate(t *testing.T) { cd, status, err := c.CustomDictionary(code) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if cd.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } customDictionary.Name = "test223" @@ -6450,16 +6448,16 @@ func TestClient_CustomDictionariesCreate(t *testing.T) { cde, status, err := c.CustomDictionaryEdit(customDictionary) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cde.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -6493,8 +6491,8 @@ func TestClient_CustomDictionariesCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.CustomDictionariesCreate(customDictionary) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if data.Success != false { @@ -6507,8 +6505,8 @@ func TestClient_CustomDictionariesCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) cd, status, err := c.CustomDictionary(codeFail) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if cd.Success != false { @@ -6536,12 +6534,12 @@ func TestClient_CustomDictionariesCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) cde, status, err := c.CustomDictionaryEdit(customDictionary) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if cde.Success != false { @@ -6578,17 +6576,17 @@ func TestClient_CustomFieldsCreate(t *testing.T) { data, status, err := c.CustomFieldsCreate(customFields) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if data.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } gock.New(crmURL). @@ -6598,16 +6596,16 @@ func TestClient_CustomFieldsCreate(t *testing.T) { customField, status, err := c.CustomField("order", codeCustomField) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if customField.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } customFields.DisplayArea = "delivery" @@ -6627,16 +6625,16 @@ func TestClient_CustomFieldsCreate(t *testing.T) { customFieldEdit, status, err := c.CustomFieldEdit(customFields) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err != nil { + t.Errorf("%v", err) } if !statuses[status] { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } if customFieldEdit.Success != true { - t.Errorf("%v", err.ApiError()) + t.Errorf("%v", err) } } @@ -6668,8 +6666,8 @@ func TestClient_CustomFieldsCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) data, status, err := c.CustomFieldsCreate(customFields) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -6686,8 +6684,8 @@ func TestClient_CustomFieldsCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "Not found"}`) customField, status, err := c.CustomField("order", codeCustomField) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { @@ -6714,8 +6712,8 @@ func TestClient_CustomFieldsCreate_Fail(t *testing.T) { BodyString(`{"success": false, "errorMsg": "API method not found"}`) customFieldEdit, status, err := c.CustomFieldEdit(customFields) - if err.Error() != "" { - t.Errorf("%v", err.Error()) + if err == nil { + t.Errorf("%v", err) } if status < http.StatusBadRequest { diff --git a/v5/error.go b/v5/error.go index 8d14e34..30f7f41 100644 --- a/v5/error.go +++ b/v5/error.go @@ -5,14 +5,14 @@ import ( "strconv" ) -// ApiErrorsList struct +// ApiErrorsList struct. type ApiErrorsList map[string]string -// ApiError struct +// ApiError struct. type ApiError struct { SuccessfulResponse - ErrorMsg string `json:"errorMsg,omitempty"` - Errors ApiErrorsList `json:"errors,omitempty"` + ErrorMsg string `json:"errorMsg,omitempty"` + Errors ApiErrorsList `json:"errors,omitempty"` } func (e *ApiError) Error() string { @@ -23,9 +23,14 @@ func (e *ApiError) GetApiErrors() map[string]string { return e.Errors } -func NewApiError (dataResponse []byte) error { +func NewApiError(dataResponse []byte) error { a := &ApiError{} + if dataResponse[0] == 60 { + a.ErrorMsg = "405 Not Allowed" + return a + } + if err := json.Unmarshal(dataResponse, a); err != nil { return err } @@ -33,7 +38,7 @@ func NewApiError (dataResponse []byte) error { return a } -// ErrorsHandler returns map +// ErrorsHandler returns map. func ErrorsHandler(errs interface{}) map[string]string { m := make(map[string]string) @@ -49,4 +54,4 @@ func ErrorsHandler(errs interface{}) map[string]string { } return m -} \ No newline at end of file +} diff --git a/v5/filters.go b/v5/filters.go index 6a653bd..1956ac8 100644 --- a/v5/filters.go +++ b/v5/filters.go @@ -1,6 +1,6 @@ package v5 -// CustomersFilter type +// CustomersFilter type. type CustomersFilter struct { Ids []string `url:"ids,omitempty,brackets"` ExternalIds []string `url:"externalIds,omitempty,brackets"` @@ -57,7 +57,7 @@ type CustomersFilter struct { CustomFields map[string]string `url:"customFields,omitempty,brackets"` } -// CorporateCustomersFilter type +// CorporateCustomersFilter type. type CorporateCustomersFilter struct { ContragentName string `url:"contragentName,omitempty"` ContragentInn string `url:"contragentInn,omitempty"` @@ -99,7 +99,7 @@ type CorporateCustomersFilter struct { CustomFields map[string]string `url:"customFields,omitempty,brackets"` } -// CorporateCustomersNotesFilter type +// CorporateCustomersNotesFilter type. type CorporateCustomersNotesFilter struct { Ids []string `url:"ids,omitempty,brackets"` CustomerIds []string `url:"ids,omitempty,brackets"` @@ -110,7 +110,7 @@ type CorporateCustomersNotesFilter struct { CreatedAtTo string `url:"createdAtTo,omitempty"` } -// CorporateCustomerAddressesFilter type +// CorporateCustomerAddressesFilter type. type CorporateCustomerAddressesFilter struct { Ids []string `url:"ids,omitempty,brackets"` Name string `url:"name,omitempty"` @@ -118,13 +118,13 @@ type CorporateCustomerAddressesFilter struct { Region string `url:"region,omitempty"` } -// IdentifiersPairFilter type +// IdentifiersPairFilter type. type IdentifiersPairFilter struct { Ids []string `url:"ids,omitempty,brackets"` ExternalIds []string `url:"externalIds,omitempty,brackets"` } -// CustomersHistoryFilter type +// CustomersHistoryFilter type. type CustomersHistoryFilter struct { CustomerID int `url:"customerId,omitempty"` SinceID int `url:"sinceId,omitempty"` @@ -133,7 +133,7 @@ type CustomersHistoryFilter struct { EndDate string `url:"endDate,omitempty"` } -// CorporateCustomersHistoryFilter type +// CorporateCustomersHistoryFilter type. type CorporateCustomersHistoryFilter struct { CustomerID int `url:"customerId,omitempty"` SinceID int `url:"sinceId,omitempty"` @@ -143,7 +143,7 @@ type CorporateCustomersHistoryFilter struct { EndDate string `url:"endDate,omitempty"` } -// OrdersFilter type +// OrdersFilter type. type OrdersFilter struct { Ids []int `url:"ids,omitempty,brackets"` ExternalIds []string `url:"externalIds,omitempty,brackets"` @@ -234,7 +234,7 @@ type OrdersFilter struct { CustomFields map[string]string `url:"customFields,omitempty,brackets"` } -// OrdersHistoryFilter type +// OrdersHistoryFilter type. type OrdersHistoryFilter struct { OrderID int `url:"orderId,omitempty"` SinceID int `url:"sinceId,omitempty"` @@ -243,7 +243,7 @@ type OrdersHistoryFilter struct { EndDate string `url:"endDate,omitempty"` } -// UsersFilter type +// UsersFilter type. type UsersFilter struct { Email string `url:"email,omitempty"` Status string `url:"status,omitempty"` @@ -256,7 +256,7 @@ type UsersFilter struct { Groups []string `url:"groups,omitempty,brackets"` } -// TasksFilter type +// TasksFilter type. type TasksFilter struct { OrderNumber string `url:"orderNumber,omitempty"` Status string `url:"status,omitempty"` @@ -268,7 +268,7 @@ type TasksFilter struct { Performers []int `url:"performers,omitempty,brackets"` } -// NotesFilter type +// NotesFilter type. type NotesFilter struct { Ids []int `url:"ids,omitempty,brackets"` CustomerIds []int `url:"customerIds,omitempty,brackets"` @@ -279,7 +279,7 @@ type NotesFilter struct { CreatedAtTo string `url:"createdAtTo,omitempty"` } -// SegmentsFilter type +// SegmentsFilter type. type SegmentsFilter struct { Ids []int `url:"ids,omitempty,brackets"` Active int `url:"active,omitempty"` @@ -291,7 +291,7 @@ type SegmentsFilter struct { DateTo string `url:"dateTo,omitempty"` } -// PacksFilter type +// PacksFilter type. type PacksFilter struct { Ids []int `url:"ids,omitempty,brackets"` Stores []string `url:"stores,omitempty"` @@ -306,7 +306,7 @@ type PacksFilter struct { DeliveryNoteNumber string `url:"deliveryNoteNumber,omitempty"` } -// InventoriesFilter type +// InventoriesFilter type. type InventoriesFilter struct { Ids []int `url:"ids,omitempty,brackets"` ProductExternalID string `url:"productExternalId,omitempty"` @@ -319,7 +319,7 @@ type InventoriesFilter struct { Sites []string `url:"sites,omitempty,brackets"` } -// ProductsGroupsFilter type +// ProductsGroupsFilter type. type ProductsGroupsFilter struct { Ids []int `url:"ids,omitempty,brackets"` Sites []string `url:"sites,omitempty,brackets"` @@ -327,7 +327,7 @@ type ProductsGroupsFilter struct { ParentGroupID string `url:"parentGroupId,omitempty"` } -// ProductsFilter type +// ProductsFilter type. type ProductsFilter struct { Ids []int `url:"ids,omitempty,brackets"` OfferIds []int `url:"offerIds,omitempty,brackets"` @@ -355,14 +355,14 @@ type ProductsFilter struct { Properties map[string]string `url:"properties,omitempty,brackets"` } -// ProductsPropertiesFilter type +// ProductsPropertiesFilter type. type ProductsPropertiesFilter struct { Code string `url:"code,omitempty"` Name string `url:"name,omitempty"` Sites []string `url:"sites,omitempty,brackets"` } -// ShipmentFilter type +// ShipmentFilter type. type ShipmentFilter struct { Ids []int `url:"ids,omitempty,brackets"` ExternalID string `url:"externalId,omitempty"` @@ -375,7 +375,7 @@ type ShipmentFilter struct { Statuses []string `url:"statuses,omitempty,brackets"` } -// CostsFilter type +// CostsFilter type. type CostsFilter struct { MinSumm string `url:"minSumm,omitempty"` MaxSumm string `url:"maxSumm,omitempty"` @@ -395,7 +395,7 @@ type CostsFilter struct { OrderExternalIds []string `url:"orderIds,omitempty,brackets"` } -// FilesFilter type +// FilesFilter type. type FilesFilter struct { Ids []int `url:"ids,omitempty,brackets"` OrderIds []int `url:"orderIds,omitempty,brackets"` @@ -412,7 +412,7 @@ type FilesFilter struct { Sites []string `url:"sites,omitempty,brackets"` } -// CustomFieldsFilter type +// CustomFieldsFilter type. type CustomFieldsFilter struct { Name string `url:"name,omitempty"` Code string `url:"code,omitempty"` @@ -422,7 +422,7 @@ type CustomFieldsFilter struct { DisplayArea string `url:"displayArea,omitempty"` } -// CustomDictionariesFilter type +// CustomDictionariesFilter type. type CustomDictionariesFilter struct { Name string `url:"name,omitempty"` Code string `url:"code,omitempty"` diff --git a/v5/marshaling.go b/v5/marshaling.go index af5f63a..93323fc 100644 --- a/v5/marshaling.go +++ b/v5/marshaling.go @@ -8,8 +8,8 @@ func (t Tag) MarshalJSON() ([]byte, error) { return json.Marshal(t.Name) } -func (a *ApiErrorsList) UnmarshalJSON (data []byte) error { - var i interface {} +func (a *ApiErrorsList) UnmarshalJSON(data []byte) error { + var i interface{} if err := json.Unmarshal(data, &i); err != nil { return err } diff --git a/v5/request.go b/v5/request.go index 87a5582..8899845 100644 --- a/v5/request.go +++ b/v5/request.go @@ -1,33 +1,33 @@ package v5 -// CustomerRequest type +// CustomerRequest type. type CustomerRequest struct { By string `url:"by,omitempty"` Site string `url:"site,omitempty"` } -// CustomersRequest type +// CustomersRequest type. type CustomersRequest struct { Filter CustomersFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CorporateCustomersRequest type +// CorporateCustomersRequest type. type CorporateCustomersRequest struct { Filter CorporateCustomersFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CorporateCustomersNotesRequest type +// CorporateCustomersNotesRequest type. type CorporateCustomersNotesRequest struct { Filter CorporateCustomersNotesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CorporateCustomerAddressesRequest type +// CorporateCustomerAddressesRequest type. type CorporateCustomerAddressesRequest struct { Filter CorporateCustomerAddressesFilter `url:"filter,omitempty"` By string `url:"by,omitempty"` @@ -36,7 +36,7 @@ type CorporateCustomerAddressesRequest struct { Page int `url:"page,omitempty"` } -// IdentifiersPairRequest type +// IdentifiersPairRequest type. type IdentifiersPairRequest struct { Filter IdentifiersPairFilter `url:"filter,omitempty"` By string `url:"by,omitempty"` @@ -45,135 +45,135 @@ type IdentifiersPairRequest struct { Page int `url:"page,omitempty"` } -// CustomersUploadRequest type +// CustomersUploadRequest type. type CustomersUploadRequest struct { Customers []Customer `url:"customers,omitempty,brackets"` Site string `url:"site,omitempty"` } -// CustomersHistoryRequest type +// CustomersHistoryRequest type. type CustomersHistoryRequest struct { Filter CustomersHistoryFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CorporateCustomersHistoryRequest type +// CorporateCustomersHistoryRequest type. type CorporateCustomersHistoryRequest struct { Filter CorporateCustomersHistoryFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// OrderRequest type +// OrderRequest type. type OrderRequest struct { By string `url:"by,omitempty"` Site string `url:"site,omitempty"` } -// OrdersRequest type +// OrdersRequest type. type OrdersRequest struct { Filter OrdersFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// OrdersStatusesRequest type +// OrdersStatusesRequest type. type OrdersStatusesRequest struct { IDs []int `url:"ids,omitempty,brackets"` ExternalIDs []string `url:"externalIds,omitempty,brackets"` } -// OrdersUploadRequest type +// OrdersUploadRequest type. type OrdersUploadRequest struct { Orders []Order `url:"orders,omitempty,brackets"` Site string `url:"site,omitempty"` } -// OrdersHistoryRequest type +// OrdersHistoryRequest type. type OrdersHistoryRequest struct { Filter OrdersHistoryFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// PacksRequest type +// PacksRequest type. type PacksRequest struct { Filter PacksFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// PacksHistoryRequest type +// PacksHistoryRequest type. type PacksHistoryRequest struct { Filter OrdersHistoryFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// UsersRequest type +// UsersRequest type. type UsersRequest struct { Filter UsersFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// UserGroupsRequest type +// UserGroupsRequest type. type UserGroupsRequest struct { Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// TasksRequest type +// TasksRequest type. type TasksRequest struct { Filter TasksFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// NotesRequest type +// NotesRequest type. type NotesRequest struct { Filter NotesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// SegmentsRequest type +// SegmentsRequest type. type SegmentsRequest struct { Filter SegmentsFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// InventoriesRequest type +// InventoriesRequest type. type InventoriesRequest struct { Filter InventoriesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// ProductsGroupsRequest type +// ProductsGroupsRequest type. type ProductsGroupsRequest struct { Filter ProductsGroupsFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// ProductsRequest type +// ProductsRequest type. type ProductsRequest struct { Filter ProductsFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// ProductsPropertiesRequest type +// ProductsPropertiesRequest type. type ProductsPropertiesRequest struct { Filter ProductsPropertiesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// DeliveryTrackingRequest type +// DeliveryTrackingRequest type. type DeliveryTrackingRequest struct { DeliveryID string `json:"deliveryId,omitempty"` TrackNumber string `json:"trackNumber,omitempty"` @@ -181,35 +181,35 @@ type DeliveryTrackingRequest struct { ExtraData map[string]string `json:"extraData,omitempty,brackets"` } -// DeliveryShipmentsRequest type +// DeliveryShipmentsRequest type. type DeliveryShipmentsRequest struct { Filter ShipmentFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CostsRequest type +// CostsRequest type. type CostsRequest struct { Filter CostsFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// FilesRequest type +// FilesRequest type. type FilesRequest struct { Filter FilesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CustomFieldsRequest type +// CustomFieldsRequest type. type CustomFieldsRequest struct { Filter CustomFieldsFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } -// CustomDictionariesRequest type +// CustomDictionariesRequest type. type CustomDictionariesRequest struct { Filter CustomDictionariesFilter `url:"filter,omitempty"` Limit int `url:"limit,omitempty"` diff --git a/v5/response.go b/v5/response.go index 227fb35..13bd09f 100644 --- a/v5/response.go +++ b/v5/response.go @@ -1,35 +1,35 @@ package v5 -// SuccessfulResponse type +// SuccessfulResponse type. type SuccessfulResponse struct { Success bool `json:"success,omitempty"` } -// CreateResponse type +// CreateResponse type. type CreateResponse struct { Success bool `json:"success"` ID int `json:"id,omitempty"` } -// OrderCreateResponse type +// OrderCreateResponse type. type OrderCreateResponse struct { CreateResponse Order Order `json:"order,omitempty"` } -// OperationResponse type +// OperationResponse type. type OperationResponse struct { Success bool `json:"success"` Errors map[string]string `json:"errors,omitempty,brackets"` } -// VersionResponse return available API versions +// VersionResponse return available API versions. type VersionResponse struct { Success bool `json:"success,omitempty"` Versions []string `json:"versions,brackets,omitempty"` } -// CredentialResponse return available API methods +// CredentialResponse return available API methods. type CredentialResponse struct { Success bool `json:"success,omitempty"` Credentials []string `json:"credentials,brackets,omitempty"` @@ -37,77 +37,77 @@ type CredentialResponse struct { SitesAvailable []string `json:"sitesAvailable,brackets,omitempty"` } -// CustomerResponse type +// CustomerResponse type. type CustomerResponse struct { Success bool `json:"success"` Customer *Customer `json:"customer,omitempty,brackets"` } -// CorporateCustomerResponse type +// CorporateCustomerResponse type. type CorporateCustomerResponse struct { Success bool `json:"success"` CorporateCustomer *CorporateCustomer `json:"customerCorporate,omitempty,brackets"` } -// CustomersResponse type +// CustomersResponse type. type CustomersResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Customers []Customer `json:"customers,omitempty,brackets"` } -// CorporateCustomersResponse type +// CorporateCustomersResponse type. type CorporateCustomersResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` CustomersCorporate []CorporateCustomer `json:"customersCorporate,omitempty,brackets"` } -// CorporateCustomersNotesResponse type +// CorporateCustomersNotesResponse type. type CorporateCustomersNotesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Notes []Note `json:"notes,omitempty,brackets"` } -// CorporateCustomersAddressesResponse type +// CorporateCustomersAddressesResponse type. type CorporateCustomersAddressesResponse struct { Success bool `json:"success"` Addresses []CorporateCustomerAddress `json:"addresses"` } -// CorporateCustomerCompaniesResponse type +// CorporateCustomerCompaniesResponse type. type CorporateCustomerCompaniesResponse struct { Success bool `json:"success"` Companies []Company `json:"companies"` } -// CorporateCustomerContactsResponse type +// CorporateCustomerContactsResponse type. type CorporateCustomerContactsResponse struct { Success bool `json:"success"` Contacts []CorporateCustomerContact `json:"contacts"` } -// CustomerChangeResponse type +// CustomerChangeResponse type. type CustomerChangeResponse struct { Success bool `json:"success"` ID int `json:"id,omitempty"` State string `json:"state,omitempty"` } -// CorporateCustomerChangeResponse type +// CorporateCustomerChangeResponse type. type CorporateCustomerChangeResponse CustomerChangeResponse -// CustomersUploadResponse type +// CustomersUploadResponse type. type CustomersUploadResponse struct { Success bool `json:"success"` UploadedCustomers []IdentifiersPair `json:"uploadedCustomers,omitempty,brackets"` } -// CorporateCustomersUploadResponse type +// CorporateCustomersUploadResponse type. type CorporateCustomersUploadResponse CustomersUploadResponse -// CustomersHistoryResponse type +// CustomersHistoryResponse type. type CustomersHistoryResponse struct { Success bool `json:"success,omitempty"` GeneratedAt string `json:"generatedAt,omitempty"` @@ -115,7 +115,7 @@ type CustomersHistoryResponse struct { Pagination *Pagination `json:"pagination,omitempty"` } -// CorporateCustomersHistoryResponse type +// CorporateCustomersHistoryResponse type. type CorporateCustomersHistoryResponse struct { Success bool `json:"success,omitempty"` GeneratedAt string `json:"generatedAt,omitempty"` @@ -123,32 +123,32 @@ type CorporateCustomersHistoryResponse struct { Pagination *Pagination `json:"pagination,omitempty"` } -// OrderResponse type +// OrderResponse type. type OrderResponse struct { Success bool `json:"success"` Order *Order `json:"order,omitempty,brackets"` } -// OrdersResponse type +// OrdersResponse type. type OrdersResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Orders []Order `json:"orders,omitempty,brackets"` } -// OrdersStatusesResponse type +// OrdersStatusesResponse type. type OrdersStatusesResponse struct { Success bool `json:"success"` Orders []OrdersStatus `json:"orders"` } -// OrdersUploadResponse type +// OrdersUploadResponse type. type OrdersUploadResponse struct { Success bool `json:"success"` UploadedOrders []IdentifiersPair `json:"uploadedOrders,omitempty,brackets"` } -// OrdersHistoryResponse type +// OrdersHistoryResponse type. type OrdersHistoryResponse struct { Success bool `json:"success,omitempty"` GeneratedAt string `json:"generatedAt,omitempty"` @@ -156,20 +156,20 @@ type OrdersHistoryResponse struct { Pagination *Pagination `json:"pagination,omitempty"` } -// PackResponse type +// PackResponse type. type PackResponse struct { Success bool `json:"success"` Pack *Pack `json:"pack,omitempty,brackets"` } -// PacksResponse type +// PacksResponse type. type PacksResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Packs []Pack `json:"packs,omitempty,brackets"` } -// PacksHistoryResponse type +// PacksHistoryResponse type. type PacksHistoryResponse struct { Success bool `json:"success,omitempty"` GeneratedAt string `json:"generatedAt,omitempty"` @@ -177,318 +177,318 @@ type PacksHistoryResponse struct { Pagination *Pagination `json:"pagination,omitempty"` } -// UserResponse type +// UserResponse type. type UserResponse struct { Success bool `json:"success"` User *User `json:"user,omitempty,brackets"` } -// UsersResponse type +// UsersResponse type. type UsersResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Users []User `json:"users,omitempty,brackets"` } -// UserGroupsResponse type +// UserGroupsResponse type. type UserGroupsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Groups []UserGroup `json:"groups,omitempty,brackets"` } -// TaskResponse type +// TaskResponse type. type TaskResponse struct { Success bool `json:"success"` Task *Task `json:"task,omitempty,brackets"` } -// TasksResponse type +// TasksResponse type. type TasksResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Tasks []Task `json:"tasks,omitempty,brackets"` } -// NotesResponse type +// NotesResponse type. type NotesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Notes []Note `json:"notes,omitempty,brackets"` } -// SegmentsResponse type +// SegmentsResponse type. type SegmentsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Segments []Segment `json:"segments,omitempty,brackets"` } -// SettingsResponse type +// SettingsResponse type. type SettingsResponse struct { - Success bool `json:"success"` - Settings Settings `json:"settings,omitempty,brackets"` + Success bool `json:"success"` + Settings Settings `json:"settings,omitempty,brackets"` } -// CountriesResponse type +// CountriesResponse type. type CountriesResponse struct { Success bool `json:"success"` CountriesIso []string `json:"countriesIso,omitempty,brackets"` } -// CostGroupsResponse type +// CostGroupsResponse type. type CostGroupsResponse struct { Success bool `json:"success"` CostGroups []CostGroup `json:"costGroups,omitempty,brackets"` } -// CostItemsResponse type +// CostItemsResponse type. type CostItemsResponse struct { Success bool `json:"success"` CostItems []CostItem `json:"costItems,omitempty,brackets"` } -// CouriersResponse type +// CouriersResponse type. type CouriersResponse struct { Success bool `json:"success"` Couriers []Courier `json:"couriers,omitempty,brackets"` } -// DeliveryServiceResponse type +// DeliveryServiceResponse type. type DeliveryServiceResponse struct { Success bool `json:"success"` DeliveryServices map[string]DeliveryService `json:"deliveryServices,omitempty,brackets"` } -// DeliveryTypesResponse type +// DeliveryTypesResponse type. type DeliveryTypesResponse struct { Success bool `json:"success"` DeliveryTypes map[string]DeliveryType `json:"deliveryTypes,omitempty,brackets"` } -// LegalEntitiesResponse type +// LegalEntitiesResponse type. type LegalEntitiesResponse struct { Success bool `json:"success"` LegalEntities []LegalEntity `json:"legalEntities,omitempty,brackets"` } -// OrderMethodsResponse type +// OrderMethodsResponse type. type OrderMethodsResponse struct { Success bool `json:"success"` OrderMethods map[string]OrderMethod `json:"orderMethods,omitempty,brackets"` } -// OrderTypesResponse type +// OrderTypesResponse type. type OrderTypesResponse struct { Success bool `json:"success"` OrderTypes map[string]OrderType `json:"orderTypes,omitempty,brackets"` } -// PaymentStatusesResponse type +// PaymentStatusesResponse type. type PaymentStatusesResponse struct { Success bool `json:"success"` PaymentStatuses map[string]PaymentStatus `json:"paymentStatuses,omitempty,brackets"` } -// PaymentTypesResponse type +// PaymentTypesResponse type. type PaymentTypesResponse struct { Success bool `json:"success"` PaymentTypes map[string]PaymentType `json:"paymentTypes,omitempty,brackets"` } -// PriceTypesResponse type +// PriceTypesResponse type. type PriceTypesResponse struct { Success bool `json:"success"` PriceTypes []PriceType `json:"priceTypes,omitempty,brackets"` } -// ProductStatusesResponse type +// ProductStatusesResponse type. type ProductStatusesResponse struct { Success bool `json:"success"` ProductStatuses map[string]ProductStatus `json:"productStatuses,omitempty,brackets"` } -// StatusesResponse type +// StatusesResponse type. type StatusesResponse struct { Success bool `json:"success"` Statuses map[string]Status `json:"statuses,omitempty,brackets"` } -// StatusGroupsResponse type +// StatusGroupsResponse type. type StatusGroupsResponse struct { Success bool `json:"success"` StatusGroups map[string]StatusGroup `json:"statusGroups,omitempty,brackets"` } -// SitesResponse type +// SitesResponse type. type SitesResponse struct { Success bool `json:"success"` Sites map[string]Site `json:"sites,omitempty,brackets"` } -// StoresResponse type +// StoresResponse type. type StoresResponse struct { Success bool `json:"success"` Stores []Store `json:"stores,omitempty,brackets"` } -// InventoriesResponse type +// InventoriesResponse type. type InventoriesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Offers []Offer `json:"offers,omitempty"` } -// StoreUploadResponse type +// StoreUploadResponse type. type StoreUploadResponse struct { Success bool `json:"success"` ProcessedOffersCount int `json:"processedOffersCount,omitempty"` NotFoundOffers []Offer `json:"notFoundOffers,omitempty"` } -// ProductsGroupsResponse type +// ProductsGroupsResponse type. type ProductsGroupsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` ProductGroup []ProductGroup `json:"productGroup,omitempty,brackets"` } -// ProductsResponse type +// ProductsResponse type. type ProductsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Products []Product `json:"products,omitempty,brackets"` } -// ProductsPropertiesResponse type +// ProductsPropertiesResponse type. type ProductsPropertiesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Properties []Property `json:"properties,omitempty,brackets"` } -// DeliveryShipmentsResponse type +// DeliveryShipmentsResponse type. type DeliveryShipmentsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` DeliveryShipments []DeliveryShipment `json:"deliveryShipments,omitempty,brackets"` } -// DeliveryShipmentResponse type +// DeliveryShipmentResponse type. type DeliveryShipmentResponse struct { Success bool `json:"success"` DeliveryShipment *DeliveryShipment `json:"deliveryShipment,omitempty,brackets"` } -// DeliveryShipmentUpdateResponse type +// DeliveryShipmentUpdateResponse type. type DeliveryShipmentUpdateResponse struct { Success bool `json:"success"` ID int `json:"id,omitempty"` Status string `json:"status,omitempty"` } -// IntegrationModuleResponse type +// IntegrationModuleResponse type. type IntegrationModuleResponse struct { Success bool `json:"success"` IntegrationModule *IntegrationModule `json:"integrationModule,omitempty"` } -// IntegrationModuleEditResponse type +// IntegrationModuleEditResponse type. type IntegrationModuleEditResponse struct { Success bool `json:"success"` Info ResponseInfo `json:"info,omitempty,brackets"` } -// ResponseInfo type +// ResponseInfo type. type ResponseInfo struct { MgTransportInfo MgInfo `json:"mgTransport,omitempty,brackets"` MgBotInfo MgInfo `json:"mgBot,omitempty,brackets"` } -// MgInfo type +// MgInfo type. type MgInfo struct { EndpointUrl string `json:"endpointUrl"` Token string `json:"token"` } -// CostsResponse type +// CostsResponse type. type CostsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Costs []Cost `json:"costs,omitempty,brackets"` } -// CostsUploadResponse type +// CostsUploadResponse type. type CostsUploadResponse struct { Success bool `json:"success"` UploadedCosts []int `json:"uploadedCosts,omitempty,brackets"` } -// CostsDeleteResponse type +// CostsDeleteResponse type. type CostsDeleteResponse struct { Success bool `json:"success"` Count int `json:"count,omitempty,brackets"` NotRemovedIds []int `json:"notRemovedIds,omitempty,brackets"` } -// CostResponse type +// CostResponse type. type CostResponse struct { Success bool `json:"success"` Cost *Cost `json:"cost,omitempty,brackets"` } -// FilesResponse type +// FilesResponse type. type FilesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` Files []File `json:"files,omitempty"` } -// FileUpload response +// FileUpload response. type FileUploadResponse struct { Success bool `json:"success"` File *File `json:"file,omitempty"` } -// FileResponse type +// FileResponse type. type FileResponse struct { Success bool `json:"success"` File *File `json:"file,omitempty"` } -// CustomFieldsResponse type +// CustomFieldsResponse type. type CustomFieldsResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` CustomFields []CustomFields `json:"customFields,omitempty,brackets"` } -// CustomDictionariesResponse type +// CustomDictionariesResponse type. type CustomDictionariesResponse struct { Success bool `json:"success"` Pagination *Pagination `json:"pagination,omitempty"` CustomDictionaries *[]CustomDictionary `json:"customDictionaries,omitempty,brackets"` } -// CustomResponse type +// CustomResponse type. type CustomResponse struct { Success bool `json:"success"` Code string `json:"code,omitempty"` } -// CustomDictionaryResponse type +// CustomDictionaryResponse type. type CustomDictionaryResponse struct { Success bool `json:"success"` CustomDictionary *CustomDictionary `json:"CustomDictionary,omitempty,brackets"` } -// CustomFieldResponse type +// CustomFieldResponse type. type CustomFieldResponse struct { Success bool `json:"success"` CustomField CustomFields `json:"customField,omitempty,brackets"` } -// UnitsResponse type +// UnitsResponse type. type UnitsResponse struct { Success bool `json:"success"` Units *[]Unit `json:"units,omitempty,brackets"` diff --git a/v5/types.go b/v5/types.go index 744fdba..348fcdd 100644 --- a/v5/types.go +++ b/v5/types.go @@ -7,13 +7,13 @@ import ( "strings" ) -// ByID is "id" constant to use as `by` property in methods +// ByID is "id" constant to use as `by` property in methods. const ByID = "id" -// ByExternalId is "externalId" constant to use as `by` property in methods +// ByExternalId is "externalId" constant to use as `by` property in methods. const ByExternalID = "externalId" -// Client type +// Client type. type Client struct { URL string Key string @@ -21,7 +21,7 @@ type Client struct { httpClient *http.Client } -// Pagination type +// Pagination type. type Pagination struct { Limit int `json:"limit,omitempty"` TotalCount int `json:"totalCount,omitempty"` @@ -29,7 +29,7 @@ type Pagination struct { TotalPageCount int `json:"totalPageCount,omitempty"` } -// Address type +// Address type. type Address struct { Index string `json:"index,omitempty"` CountryIso string `json:"countryIso,omitempty"` @@ -51,7 +51,7 @@ type Address struct { Text string `json:"text,omitempty"` } -// GeoHierarchyRow type +// GeoHierarchyRow type. type GeoHierarchyRow struct { Country string `json:"country,omitempty"` Region string `json:"region,omitempty"` @@ -60,7 +60,7 @@ type GeoHierarchyRow struct { CityID int `json:"cityId,omitempty"` } -// Source type +// Source type. type Source struct { Source string `json:"source,omitempty"` Medium string `json:"medium,omitempty"` @@ -69,7 +69,7 @@ type Source struct { Content string `json:"content,omitempty"` } -// Contragent type +// Contragent type. type Contragent struct { ContragentType string `json:"contragentType,omitempty"` LegalName string `json:"legalName,omitempty"` @@ -88,12 +88,12 @@ type Contragent struct { BankAccount string `json:"bankAccount,omitempty"` } -// APIKey type +// APIKey type. type APIKey struct { Current bool `json:"current,omitempty"` } -// Property type +// Property type. type Property struct { Code string `json:"code,omitempty"` Name string `json:"name,omitempty"` @@ -101,13 +101,13 @@ type Property struct { Sites []string `json:"Sites,omitempty,brackets"` } -// IdentifiersPair type +// IdentifiersPair type. type IdentifiersPair struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` } -// DeliveryTime type +// DeliveryTime type. type DeliveryTime struct { From string `json:"from,omitempty"` To string `json:"to,omitempty"` @@ -118,7 +118,7 @@ type DeliveryTime struct { Customer related types */ -// Customer type +// Customer type. type Customer struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -157,7 +157,7 @@ type Customer struct { Tags []Tag `json:"tags,brackets,omitempty"` } -// CorporateCustomer type +// CorporateCustomer type. type CorporateCustomer struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -229,19 +229,19 @@ type Company struct { CustomFields map[string]string `json:"customFields,omitempty,brackets"` } -// CorporateCustomerNote type +// CorporateCustomerNote type. type CorporateCustomerNote struct { ManagerID int `json:"managerId,omitempty"` Text string `json:"text,omitempty"` Customer *IdentifiersPair `json:"customer,omitempty"` } -// Phone type +// Phone type. type Phone struct { Number string `json:"number,omitempty"` } -// CustomerHistoryRecord type +// CustomerHistoryRecord type. type CustomerHistoryRecord struct { ID int `json:"id,omitempty"` CreatedAt string `json:"createdAt,omitempty"` @@ -254,7 +254,7 @@ type CustomerHistoryRecord struct { Customer *Customer `json:"customer,omitempty,brackets"` } -// CorporateCustomerHistoryRecord type +// CorporateCustomerHistoryRecord type. type CorporateCustomerHistoryRecord struct { ID int `json:"id,omitempty"` CreatedAt string `json:"createdAt,omitempty"` @@ -271,7 +271,7 @@ type CorporateCustomerHistoryRecord struct { Order related types */ -// Order type +// Order type. type Order struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -324,7 +324,7 @@ type Order struct { Payments map[string]OrderPayment `json:"payments,omitempty,brackets"` } -// OrdersStatus type +// OrdersStatus type. type OrdersStatus struct { ID int `json:"id"` ExternalID string `json:"externalId,omitempty"` @@ -332,7 +332,7 @@ type OrdersStatus struct { Group string `json:"group"` } -// OrderDelivery type +// OrderDelivery type. type OrderDelivery struct { Code string `json:"code,omitempty"` IntegrationCode string `json:"integrationCode,omitempty"` @@ -346,21 +346,21 @@ type OrderDelivery struct { Data *OrderDeliveryData `json:"data,omitempty"` } -// OrderDeliveryTime type +// OrderDeliveryTime type. type OrderDeliveryTime struct { From string `json:"from,omitempty"` To string `json:"to,omitempty"` Custom string `json:"custom,omitempty"` } -// OrderDeliveryService type +// OrderDeliveryService type. type OrderDeliveryService struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` Active bool `json:"active,omitempty"` } -// OrderDeliveryDataBasic type +// OrderDeliveryDataBasic type. type OrderDeliveryDataBasic struct { TrackNumber string `json:"trackNumber,omitempty"` Status string `json:"status,omitempty"` @@ -368,13 +368,13 @@ type OrderDeliveryDataBasic struct { PayerType string `json:"payerType,omitempty"` } -// OrderDeliveryData type +// OrderDeliveryData type. type OrderDeliveryData struct { OrderDeliveryDataBasic AdditionalFields map[string]interface{} } -// UnmarshalJSON method +// UnmarshalJSON method. func (v *OrderDeliveryData) UnmarshalJSON(b []byte) error { var additionalData map[string]interface{} json.Unmarshal(b, &additionalData) @@ -396,7 +396,7 @@ func (v *OrderDeliveryData) UnmarshalJSON(b []byte) error { return nil } -// MarshalJSON method +// MarshalJSON method. func (v OrderDeliveryData) MarshalJSON() ([]byte, error) { result := map[string]interface{}{} data, _ := json.Marshal(v.OrderDeliveryDataBasic) @@ -409,13 +409,13 @@ func (v OrderDeliveryData) MarshalJSON() ([]byte, error) { return json.Marshal(result) } -// OrderMarketplace type +// OrderMarketplace type. type OrderMarketplace struct { Code string `json:"code,omitempty"` OrderID string `json:"orderId,omitempty"` } -// OrderPayment type +// OrderPayment type. type OrderPayment struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -426,7 +426,7 @@ type OrderPayment struct { Comment string `json:"comment,omitempty"` } -// OrderItem type +// OrderItem type. type OrderItem struct { ID int `json:"id,omitempty"` InitialPrice float32 `json:"initialPrice,omitempty"` @@ -446,7 +446,7 @@ type OrderItem struct { PriceType *PriceType `json:"priceType,omitempty"` } -// OrdersHistoryRecord type +// OrdersHistoryRecord type. type OrdersHistoryRecord struct { ID int `json:"id,omitempty"` CreatedAt string `json:"createdAt,omitempty"` @@ -459,7 +459,7 @@ type OrdersHistoryRecord struct { Order *Order `json:"order,omitempty,brackets"` } -// Pack type +// Pack type. type Pack struct { ID int `json:"id,omitempty"` PurchasePrice float32 `json:"purchasePrice,omitempty"` @@ -473,14 +473,14 @@ type Pack struct { Unit *Unit `json:"unit,omitempty"` } -// PackItem type +// PackItem type. type PackItem struct { ID int `json:"id,omitempty"` Order *Order `json:"order,omitempty"` Offer *Offer `json:"offer,omitempty"` } -// PacksHistoryRecord type +// PacksHistoryRecord type. type PacksHistoryRecord struct { ID int `json:"id,omitempty"` CreatedAt string `json:"createdAt,omitempty"` @@ -492,7 +492,7 @@ type PacksHistoryRecord struct { Pack *Pack `json:"pack,omitempty,brackets"` } -// Offer type +// Offer type. type Offer struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -514,14 +514,14 @@ type Offer struct { Unit *Unit `json:"unit,omitempty,brackets"` } -// Inventory type +// Inventory type. type Inventory struct { PurchasePrice float32 `json:"purchasePrice,omitempty"` Quantity float32 `json:"quantity,omitempty"` Store string `json:"store,omitempty"` } -// InventoryUpload type +// InventoryUpload type. type InventoryUpload struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -529,21 +529,21 @@ type InventoryUpload struct { Stores []InventoryUploadStore `json:"stores,omitempty"` } -// InventoryUploadStore type +// InventoryUploadStore type. type InventoryUploadStore struct { PurchasePrice float32 `json:"purchasePrice,omitempty"` Available float32 `json:"available,omitempty"` Code string `json:"code,omitempty"` } -// OfferPrice type +// OfferPrice type. type OfferPrice struct { Price float32 `json:"price,omitempty"` Ordering int `json:"ordering,omitempty"` PriceType string `json:"priceType,omitempty"` } -// OfferPriceUpload type +// OfferPriceUpload type. type OfferPriceUpload struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -552,13 +552,13 @@ type OfferPriceUpload struct { Prices []PriceUpload `json:"prices,omitempty"` } -// PriceUpload type +// PriceUpload type. type PriceUpload struct { Code string `json:"code,omitempty"` Price float32 `json:"price,omitempty"` } -// Unit type +// Unit type. type Unit struct { Code string `json:"code"` Name string `json:"name"` @@ -571,7 +571,7 @@ type Unit struct { User related types */ -// User type +// User type. type User struct { ID int `json:"id,omitempty"` FirstName string `json:"firstName,omitempty"` @@ -589,7 +589,7 @@ type User struct { MgUserId uint64 `json:"mgUserId,omitempty"` } -// UserGroup type +// UserGroup type. type UserGroup struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -608,7 +608,7 @@ type UserGroup struct { Task related types */ -// Task type +// Task type. type Task struct { ID int `json:"id,omitempty"` PerformerID int `json:"performerId,omitempty"` @@ -629,7 +629,7 @@ type Task struct { Notes related types */ -// Note type +// Note type. type Note struct { ID int `json:"id,omitempty"` ManagerID int `json:"managerId,omitempty"` @@ -642,7 +642,7 @@ type Note struct { Payments related types */ -// Payment type +// Payment type. type Payment struct { ID int `json:"id,omitempty"` ExternalID string `json:"externalId,omitempty"` @@ -658,7 +658,7 @@ type Payment struct { Segment related types */ -// Segment type +// Segment type. type Segment struct { ID int `json:"id,omitempty"` Code string `json:"code,omitempty"` @@ -690,7 +690,7 @@ type Settings struct { Reference related types */ -// CostGroup type +// CostGroup type. type CostGroup struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -699,7 +699,7 @@ type CostGroup struct { Ordering int `json:"ordering,omitempty"` } -// CostItem type +// CostItem type. type CostItem struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -712,7 +712,7 @@ type CostItem struct { Source *Source `json:"source,omitempty"` } -// Courier type +// Courier type. type Courier struct { ID int `json:"id,omitempty"` FirstName string `json:"firstName,omitempty"` @@ -724,14 +724,14 @@ type Courier struct { Phone *Phone `json:"phone,omitempty"` } -// DeliveryService type +// DeliveryService type. type DeliveryService struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` Active bool `json:"active,omitempty"` } -// DeliveryType type +// DeliveryType type. type DeliveryType struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -746,7 +746,7 @@ type DeliveryType struct { PaymentTypes []string `json:"paymentTypes,omitempty"` } -// LegalEntity type +// LegalEntity type. type LegalEntity struct { Code string `json:"code,omitempty"` VatRate string `json:"vatRate,omitempty"` @@ -768,7 +768,7 @@ type LegalEntity struct { BankAccount string `json:"bankAccount,omitempty"` } -// OrderMethod type +// OrderMethod type. type OrderMethod struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -777,7 +777,7 @@ type OrderMethod struct { DefaultForAPI bool `json:"defaultForApi,omitempty"` } -// OrderType type +// OrderType type. type OrderType struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -786,7 +786,7 @@ type OrderType struct { DefaultForAPI bool `json:"defaultForApi,omitempty"` } -// PaymentStatus type +// PaymentStatus type. type PaymentStatus struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -799,7 +799,7 @@ type PaymentStatus struct { PaymentTypes []string `json:"paymentTypes,omitempty,brackets"` } -// PaymentType type +// PaymentType type. type PaymentType struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -811,7 +811,7 @@ type PaymentType struct { PaymentStatuses []string `json:"PaymentStatuses,omitempty,brackets"` } -// PriceType type +// PriceType type. type PriceType struct { ID int `json:"id,omitempty"` Code string `json:"code,omitempty"` @@ -825,7 +825,7 @@ type PriceType struct { Geo []GeoHierarchyRow `json:"geo,omitempty,brackets"` } -// ProductStatus type +// ProductStatus type. type ProductStatus struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -837,7 +837,7 @@ type ProductStatus struct { OrderStatusForProductStatus string `json:"orderStatusForProductStatus,omitempty"` } -// Status type +// Status type. type Status struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -846,7 +846,7 @@ type Status struct { Group string `json:"group,omitempty"` } -// StatusGroup type +// StatusGroup type. type StatusGroup struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -856,7 +856,7 @@ type StatusGroup struct { Statuses []string `json:"statuses,omitempty,brackets"` } -// Site type +// Site type. type Site struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -873,7 +873,7 @@ type Site struct { Contragent *LegalEntity `json:"contragent,omitempty"` } -// Store type +// Store type. type Store struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -888,7 +888,7 @@ type Store struct { Address *Address `json:"address,omitempty"` } -// ProductGroup type +// ProductGroup type. type ProductGroup struct { ID int `json:"id,omitempty"` ParentID int `json:"parentId,omitempty"` @@ -897,7 +897,7 @@ type ProductGroup struct { Active bool `json:"active,omitempty"` } -// Product type +// Product type. type Product struct { ID int `json:"id,omitempty"` MaxPrice float32 `json:"maxPrice,omitempty"` @@ -920,14 +920,14 @@ type Product struct { Properties map[string]string `json:"properties,omitempty,brackets"` } -// DeliveryHistoryRecord type +// DeliveryHistoryRecord type. type DeliveryHistoryRecord struct { Code string `json:"code,omitempty"` UpdatedAt string `json:"updatedAt,omitempty"` Comment string `json:"comment,omitempty"` } -// DeliveryShipment type +// DeliveryShipment type. type DeliveryShipment struct { IntegrationCode string `json:"integrationCode,omitempty"` ID int `json:"id,omitempty"` @@ -944,7 +944,7 @@ type DeliveryShipment struct { ExtraData map[string]string `json:"extraData,omitempty,brackets"` } -// IntegrationModule type +// IntegrationModule type. type IntegrationModule struct { Code string `json:"code,omitempty"` IntegrationCode string `json:"integrationCode,omitempty"` @@ -961,7 +961,7 @@ type IntegrationModule struct { Integrations *Integrations `json:"integrations,omitempty"` } -// Integrations type +// Integrations type. type Integrations struct { Telephony *Telephony `json:"telephony,omitempty"` Delivery *Delivery `json:"delivery,omitempty"` @@ -970,7 +970,7 @@ type Integrations struct { MgBot *MgBot `json:"mgBot,omitempty"` } -// Delivery type +// Delivery type. type Delivery struct { Description string `json:"description,omitempty"` Actions map[string]string `json:"actions,omitempty,brackets"` @@ -989,20 +989,20 @@ type Delivery struct { ShipmentDataFieldList []DeliveryDataField `json:"shipmentDataFieldList,omitempty"` } -// DeliveryStatus type +// DeliveryStatus type. type DeliveryStatus struct { Code string `json:"code,omitempty"` Name string `json:"name,omitempty"` IsEditable bool `json:"isEditable,omitempty"` } -// Plate type +// Plate type. type Plate struct { Code string `json:"code,omitempty"` Label string `json:"label,omitempty"` } -// DeliveryDataField type +// DeliveryDataField type. type DeliveryDataField struct { Code string `json:"code,omitempty"` Label string `json:"label,omitempty"` @@ -1015,7 +1015,7 @@ type DeliveryDataField struct { Editable bool `json:"editable,omitempty"` } -// Telephony type +// Telephony type. type Telephony struct { MakeCallURL string `json:"makeCallUrl,omitempty"` AllowEdit bool `json:"allowEdit,omitempty"` @@ -1027,43 +1027,43 @@ type Telephony struct { ExternalPhones []ExternalPhone `json:"externalPhones,omitempty,brackets"` } -// AdditionalCode type +// AdditionalCode type. type AdditionalCode struct { Code string `json:"code,omitempty"` UserID string `json:"userId,omitempty"` } -// ExternalPhone type +// ExternalPhone type. type ExternalPhone struct { SiteCode string `json:"siteCode,omitempty"` ExternalPhone string `json:"externalPhone,omitempty"` } -// Warehouse type +// Warehouse type. type Warehouse struct { Actions []Action `json:"actions,omitempty,brackets"` } -// Action type +// Action type. type Action struct { Code string `json:"code,omitempty"` URL string `json:"url,omitempty"` CallPoints []string `json:"callPoints,omitempty"` } -// MgTransport type +// MgTransport type. type MgTransport struct { WebhookUrl string `json:"webhookUrl,omitempty"` } -// MgBot type +// MgBot type. type MgBot struct{} /** Cost related types */ -// CostRecord type +// CostRecord type. type CostRecord struct { Source *Source `json:"source,omitempty"` Comment string `json:"comment,omitempty"` @@ -1076,7 +1076,7 @@ type CostRecord struct { Sites []string `json:"sites,omitempty,brackets"` } -// Cost type +// Cost type. type Cost struct { Source *Source `json:"source,omitempty"` ID int `json:"id,omitempty"` @@ -1092,7 +1092,7 @@ type Cost struct { Sites []string `json:"sites,omitempty,brackets"` } -// File type +// File type. type File struct { ID int `json:"id,omitempty"` Filename string `json:"filename,omitempty"` @@ -1102,13 +1102,13 @@ type File struct { Attachment []Attachment `json:"attachment,omitempty"` } -// Attachment type +// Attachment type. type Attachment struct { Customer *Customer `json:"customer,omitempty"` Order *Order `json:"order,omitempty"` } -// CustomFields type +// CustomFields type. type CustomFields struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` @@ -1129,27 +1129,27 @@ type CustomFields struct { CustomDictionaries related types */ -// CustomDictionary type +// CustomDictionary type. type CustomDictionary struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` Elements []Element `json:"elements,omitempty,brackets"` } -// Element type +// Element type. type Element struct { Name string `json:"name,omitempty"` Code string `json:"code,omitempty"` Ordering int `json:"ordering,omitempty"` } -// Activity struct +// Activity struct. type Activity struct { Active bool `json:"active"` Freeze bool `json:"freeze"` } -// Tag struct +// Tag struct. type Tag struct { Name string `json:"name,omitempty"` Color string `json:"color,omitempty"`