From a09de71b1b64918676ad8348af48e2e76735a72c Mon Sep 17 00:00:00 2001 From: Ruslan Efanov Date: Wed, 21 Apr 2021 10:51:49 +0300 Subject: [PATCH] fixed review --- v5/client.go | 546 +++------------------------------------------- v5/client_test.go | 287 ++++-------------------- v5/error.go | 2 +- 3 files changed, 75 insertions(+), 760 deletions(-) diff --git a/v5/client.go b/v5/client.go index 150b133..122e200 100644 --- a/v5/client.go +++ b/v5/client.go @@ -78,11 +78,14 @@ func (c *Client) GetRequest(urlWithParameters string, versioned ...bool) ([]byte } // PostRequest implements POST Request with generic body data. -func (c *Client) PostRequest(uri string, postData interface{}, contType ...string) ([]byte, int, error) { +func (c *Client) PostRequest( + uri string, + postData interface{}, + contType ...string, +) ([]byte, int, error) { var ( res []byte contentType string - reader io.Reader ) prefix := "/api/v5" @@ -94,16 +97,9 @@ func (c *Client) PostRequest(uri string, postData interface{}, contType ...strin contentType = "application/x-www-form-urlencoded" } - switch postData.(type) { - case url.Values: - reader = strings.NewReader(postData.(url.Values).Encode()) - default: - if i, ok := postData.(io.Reader); ok { - reader = i - } else { - err := errors.New("postData should be url.Values or implement io.Reader") - return []byte{}, 0, err - } + reader, err := getReaderForPostData(postData) + if err != nil { + return res, 0, err } req, err := http.NewRequest("POST", fmt.Sprintf("%s%s%s", c.URL, prefix, uri), reader) @@ -144,6 +140,24 @@ func (c *Client) PostRequest(uri string, postData interface{}, contType ...strin return res, resp.StatusCode, nil } +func getReaderForPostData(postData interface{}) (io.Reader, error) { + var reader io.Reader + + switch d := postData.(type) { + case url.Values: + reader = strings.NewReader(d.Encode()) + default: + if i, ok := d.(io.Reader); ok { + reader = i + } else { + err := errors.New("postData should be url.Values or implement io.Reader") + return nil, err + } + } + + return reader, nil +} + func buildRawResponse(resp *http.Response) ([]byte, error) { defer resp.Body.Close() @@ -208,10 +222,6 @@ func (c *Client) APIVersions() (VersionResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -246,10 +256,6 @@ func (c *Client) APICredentials() (CredentialResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -291,10 +297,6 @@ func (c *Client) Customers(parameters CustomersRequest) (CustomersResponse, int, json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -333,10 +335,6 @@ func (c *Client) CustomersCombine(customers []Customer, resultCustomer Customer) json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -389,10 +387,6 @@ func (c *Client) CustomerCreate(customer Customer, site ...string) (CustomerChan json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -432,10 +426,6 @@ func (c *Client) CustomersFixExternalIds(customers []IdentifiersPair) (Successfu json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -476,10 +466,6 @@ func (c *Client) CustomersHistory(parameters CustomersHistoryRequest) (Customers json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -521,10 +507,6 @@ func (c *Client) CustomerNotes(parameters NotesRequest) (NotesResponse, int, err json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -573,10 +555,6 @@ func (c *Client) CustomerNoteCreate(note Note, site ...string) (CreateResponse, json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -610,10 +588,6 @@ func (c *Client) CustomerNoteDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -671,10 +645,6 @@ func (c *Client) CustomersUpload(customers []Customer, site ...string) (Customer json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -713,10 +683,6 @@ func (c *Client) Customer(id, by, site string) (CustomerResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -775,10 +741,6 @@ func (c *Client) CustomerEdit(customer Customer, by string, site ...string) (Cus json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -820,10 +782,6 @@ func (c *Client) CorporateCustomers(parameters CorporateCustomersRequest) (Corpo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -870,10 +828,6 @@ func (c *Client) CorporateCustomerCreate(customer CorporateCustomer, site ...str json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -913,10 +867,6 @@ func (c *Client) CorporateCustomersFixExternalIds(customers []IdentifiersPair) ( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -959,10 +909,6 @@ func (c *Client) CorporateCustomersHistory(parameters CorporateCustomersHistoryR json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1006,10 +952,6 @@ func (c *Client) CorporateCustomersNotes(parameters CorporateCustomersNotesReque json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1057,10 +999,6 @@ func (c *Client) CorporateCustomerNoteCreate(note CorporateCustomerNote, site .. json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1095,10 +1033,6 @@ func (c *Client) CorporateCustomerNoteDelete(id int) (SuccessfulResponse, int, e json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1152,10 +1086,6 @@ func (c *Client) CorporateCustomersUpload( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1194,10 +1124,6 @@ func (c *Client) CorporateCustomer(id, by, site string) (CorporateCustomerRespon json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1245,10 +1171,6 @@ func (c *Client) CorporateCustomerAddresses( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1297,10 +1219,6 @@ func (c *Client) CorporateCustomerAddressesCreate( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1368,10 +1286,6 @@ func (c *Client) CorporateCustomerAddressesEdit( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1419,10 +1333,6 @@ func (c *Client) CorporateCustomerCompanies( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1470,10 +1380,6 @@ func (c *Client) CorporateCustomerCompaniesCreate( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1541,10 +1447,6 @@ func (c *Client) CorporateCustomerCompaniesEdit( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1592,10 +1494,6 @@ func (c *Client) CorporateCustomerContacts( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1648,10 +1546,6 @@ func (c *Client) CorporateCustomerContactsCreate( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1716,10 +1610,6 @@ func (c *Client) CorporateCustomerContactsEdit( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1780,10 +1670,6 @@ func (c *Client) CorporateCustomerEdit(customer CorporateCustomer, by string, si json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1836,10 +1722,6 @@ func (c *Client) DeliveryTracking(parameters []DeliveryTrackingRequest, subcode json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1881,10 +1763,6 @@ func (c *Client) DeliveryShipments(parameters DeliveryShipmentsRequest) (Deliver json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1939,10 +1817,6 @@ func (c *Client) DeliveryShipmentCreate( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -1977,10 +1851,6 @@ func (c *Client) DeliveryShipment(id int) (DeliveryShipmentResponse, int, error) json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2026,10 +1896,6 @@ func (c *Client) DeliveryShipmentEdit(shipment DeliveryShipment, site ...string) json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2064,10 +1930,6 @@ func (c *Client) IntegrationModule(code string) (IntegrationModuleResponse, int, json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2119,10 +1981,6 @@ func (c *Client) IntegrationModuleEdit(integrationModule IntegrationModule) ( json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2159,10 +2017,6 @@ func (c *Client) Orders(parameters OrdersRequest) (OrdersResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2202,10 +2056,6 @@ func (c *Client) OrdersCombine(technique string, order, resultOrder Order) (Oper json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2253,10 +2103,6 @@ func (c *Client) OrderCreate(order Order, site ...string) (OrderCreateResponse, json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2300,10 +2146,6 @@ func (c *Client) OrdersFixExternalIds(orders []IdentifiersPair) (SuccessfulRespo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2340,10 +2182,6 @@ func (c *Client) OrdersHistory(parameters OrdersHistoryRequest) (OrdersHistoryRe json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2392,10 +2230,6 @@ func (c *Client) OrderPaymentCreate(payment Payment, site ...string) (CreateResp json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2430,10 +2264,6 @@ func (c *Client) OrderPaymentDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2485,10 +2315,6 @@ func (c *Client) OrderPaymentEdit(payment Payment, by string, site ...string) (S json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2524,10 +2350,6 @@ func (c *Client) OrdersStatuses(request OrdersStatusesRequest) (OrdersStatusesRe json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2585,10 +2407,6 @@ func (c *Client) OrdersUpload(orders []Order, site ...string) (OrdersUploadRespo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2627,10 +2445,6 @@ func (c *Client) Order(id, by, site string) (OrderResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2682,10 +2496,6 @@ func (c *Client) OrderEdit(order Order, by string, site ...string) (CreateRespon json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2722,10 +2532,6 @@ func (c *Client) Packs(parameters PacksRequest) (PacksResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2769,10 +2575,6 @@ func (c *Client) PackCreate(pack Pack) (CreateResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2809,10 +2611,6 @@ func (c *Client) PacksHistory(parameters PacksHistoryRequest) (PacksHistoryRespo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2847,10 +2645,6 @@ func (c *Client) Pack(id int) (PackResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2881,10 +2675,6 @@ func (c *Client) PackDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2921,10 +2711,6 @@ func (c *Client) PackEdit(pack Pack) (CreateResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2941,10 +2727,6 @@ func (c *Client) Countries() (CountriesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -2961,10 +2743,6 @@ func (c *Client) CostGroups() (CostGroupsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3004,10 +2782,6 @@ func (c *Client) CostGroupEdit(costGroup CostGroup) (SuccessfulResponse, int, er json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3024,10 +2798,6 @@ func (c *Client) CostItems() (CostItemsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3067,10 +2837,6 @@ func (c *Client) CostItemEdit(costItem CostItem) (SuccessfulResponse, int, error json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3087,10 +2853,6 @@ func (c *Client) Couriers() (CouriersResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3136,10 +2898,6 @@ func (c *Client) CourierCreate(courier Courier) (CreateResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3179,10 +2937,6 @@ func (c *Client) CourierEdit(courier Courier) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3199,10 +2953,6 @@ func (c *Client) DeliveryServices() (DeliveryServiceResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3242,10 +2992,6 @@ func (c *Client) DeliveryServiceEdit(deliveryService DeliveryService) (Successfu json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3262,10 +3008,6 @@ func (c *Client) DeliveryTypes() (DeliveryTypesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3307,10 +3049,6 @@ func (c *Client) DeliveryTypeEdit(deliveryType DeliveryType) (SuccessfulResponse json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3327,10 +3065,6 @@ func (c *Client) LegalEntities() (LegalEntitiesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3370,10 +3104,6 @@ func (c *Client) LegalEntityEdit(legalEntity LegalEntity) (SuccessfulResponse, i json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3390,10 +3120,6 @@ func (c *Client) OrderMethods() (OrderMethodsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3434,10 +3160,6 @@ func (c *Client) OrderMethodEdit(orderMethod OrderMethod) (SuccessfulResponse, i json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3454,10 +3176,6 @@ func (c *Client) OrderTypes() (OrderTypesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3498,10 +3216,6 @@ func (c *Client) OrderTypeEdit(orderType OrderType) (SuccessfulResponse, int, er json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3518,10 +3232,6 @@ func (c *Client) PaymentStatuses() (PaymentStatusesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3544,10 +3254,6 @@ func (c *Client) PaymentStatusEdit(paymentStatus PaymentStatus) (SuccessfulRespo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3564,10 +3270,6 @@ func (c *Client) PaymentTypes() (PaymentTypesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3590,10 +3292,6 @@ func (c *Client) PaymentTypeEdit(paymentType PaymentType) (SuccessfulResponse, i json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3610,10 +3308,6 @@ func (c *Client) PriceTypes() (PriceTypesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3636,10 +3330,6 @@ func (c *Client) PriceTypeEdit(priceType PriceType) (SuccessfulResponse, int, er json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3656,10 +3346,6 @@ func (c *Client) ProductStatuses() (ProductStatusesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3682,10 +3368,6 @@ func (c *Client) ProductStatusEdit(productStatus ProductStatus) (SuccessfulRespo json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3702,10 +3384,6 @@ func (c *Client) Sites() (SitesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3728,10 +3406,6 @@ func (c *Client) SiteEdit(site Site) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3748,10 +3422,6 @@ func (c *Client) StatusGroups() (StatusGroupsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3768,10 +3438,6 @@ func (c *Client) Statuses() (StatusesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3794,10 +3460,6 @@ func (c *Client) StatusEdit(st Status) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3814,10 +3476,6 @@ func (c *Client) Stores() (StoresResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3840,10 +3498,6 @@ func (c *Client) StoreEdit(store Store) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3860,10 +3514,6 @@ func (c *Client) Units() (UnitsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3886,10 +3536,6 @@ func (c *Client) UnitEdit(unit Unit) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3930,10 +3576,6 @@ func (c *Client) Segments(parameters SegmentsRequest) (SegmentsResponse, int, er json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -3966,10 +3608,6 @@ func (c *Client) Settings() (SettingsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4006,10 +3644,6 @@ func (c *Client) Inventories(parameters InventoriesRequest) (InventoriesResponse json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4069,10 +3703,6 @@ func (c *Client) InventoriesUpload(inventories []InventoryUpload, site ...string json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4122,10 +3752,6 @@ func (c *Client) PricesUpload(prices []OfferPriceUpload) (StoreUploadResponse, i json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4166,10 +3792,6 @@ func (c *Client) ProductsGroup(parameters ProductsGroupsRequest) (ProductsGroups json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4211,10 +3833,6 @@ func (c *Client) Products(parameters ProductsRequest) (ProductsResponse, int, er json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4255,10 +3873,6 @@ func (c *Client) ProductsProperties(parameters ProductsPropertiesRequest) (Produ json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4299,10 +3913,6 @@ func (c *Client) Tasks(parameters TasksRequest) (TasksResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4347,10 +3957,6 @@ func (c *Client) TaskCreate(task Task, site ...string) (CreateResponse, int, err json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4385,10 +3991,6 @@ func (c *Client) Task(id int) (TaskResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4472,10 +4074,6 @@ func (c *Client) UserGroups(parameters UserGroupsRequest) (UserGroupsResponse, i json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4512,10 +4110,6 @@ func (c *Client) Users(parameters UsersRequest) (UsersResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4550,10 +4144,6 @@ func (c *Client) User(id int) (UserResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4608,10 +4198,6 @@ func (c *Client) StaticticsUpdate() (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4654,10 +4240,6 @@ func (c *Client) Costs(costs CostsRequest) (CostsResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4712,10 +4294,6 @@ func (c *Client) CostCreate(cost CostRecord, site ...string) (CreateResponse, in json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4756,10 +4334,6 @@ func (c *Client) CostsDelete(ids []int) (CostsDeleteResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4817,10 +4391,6 @@ func (c *Client) CostsUpload(cost []CostRecord) (CostsUploadResponse, int, error json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4856,10 +4426,6 @@ func (c *Client) Cost(id int) (CostResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4897,10 +4463,6 @@ func (c *Client) CostDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4948,10 +4510,6 @@ func (c *Client) CostEdit(id int, cost CostRecord, site ...string) (CreateRespon json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -4989,10 +4547,6 @@ func (c *Client) Files(files FilesRequest) (FilesResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5029,10 +4583,6 @@ func (c *Client) FileUpload(reader io.Reader) (FileUploadResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5067,10 +4617,6 @@ func (c *Client) File(id int) (FileResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5102,10 +4648,6 @@ func (c *Client) FileDelete(id int) (SuccessfulResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5169,10 +4711,6 @@ func (c *Client) FileEdit(id int, file File) (FileResponse, int, error) { json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5213,10 +4751,6 @@ func (c *Client) CustomFields(customFields CustomFieldsRequest) (CustomFieldsRes json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5260,10 +4794,6 @@ func (c *Client) CustomDictionaries(customDictionaries CustomDictionariesRequest json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5318,10 +4848,6 @@ func (c *Client) CustomDictionariesCreate(customDictionary CustomDictionary) (Cu json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5357,10 +4883,6 @@ func (c *Client) CustomDictionary(code string) (CustomDictionaryResponse, int, e json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5414,10 +4936,6 @@ func (c *Client) CustomDictionaryEdit(customDictionary CustomDictionary) (Custom json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5465,10 +4983,6 @@ func (c *Client) CustomFieldsCreate(customFields CustomFields) (CustomResponse, json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5504,10 +5018,6 @@ func (c *Client) CustomField(entity, code string) (CustomFieldResponse, int, err json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } @@ -5555,9 +5065,5 @@ func (c *Client) CustomFieldEdit(customFields CustomFields) (CustomResponse, int json.Unmarshal(data, &resp) - if resp.Success == false { - return resp, status, NewAPIError(data) - } - return resp, status, nil } diff --git a/v5/client_test.go b/v5/client_test.go index 47d3beb..c8687d7 100644 --- a/v5/client_test.go +++ b/v5/client_test.go @@ -112,15 +112,11 @@ func TestClient_ApiVersionsVersions(t *testing.T) { Reply(200). BodyString(`{"success": true, "versions" : ["1.0", "4.0", "3.0", "4.0", "5.0"]}`) - data, status, err := c.APIVersions() + data, _, err := c.APIVersions() if err != nil { t.Errorf("%v", err.Error()) } - if status >= http.StatusBadRequest { - t.Errorf("%v", err) - } - if data.Success != true { t.Errorf("%v", err) } @@ -133,18 +129,14 @@ func TestClient_ApiVersionsVersionsBadUrl(t *testing.T) { gock.New(badURL). Get("/api/api-versions"). - Reply(200). + Reply(400). BodyString(`{"success": false, "errorMsg" : "Account does not exist"}`) - data, status, err := c.APIVersions() + data, _, err := c.APIVersions() if err == nil { t.Error("Error must be return") } - if status >= http.StatusBadRequest { - t.Errorf("%v", err) - } - if data.Success != false { t.Logf("%v", err) } @@ -160,15 +152,11 @@ func TestClient_ApiCredentialsCredentialsBadKey(t *testing.T) { c := client() - data, status, err := c.APICredentials() + data, _, err := c.APICredentials() if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Logf("%v", err) - } - if data.Success != false { t.Logf("%v", err) } @@ -184,15 +172,11 @@ func TestClient_ApiCredentialsCredentials(t *testing.T) { c := client() - data, status, err := c.APICredentials() + data, _, err := c.APICredentials() if err != nil { t.Errorf("%v", err) } - if status >= http.StatusBadRequest { - t.Errorf("%v", err) - } - if data.Success != true { t.Errorf("%v", err) } @@ -241,7 +225,7 @@ func TestClient_CustomersCustomers_Fail(t *testing.T) { c := client() - data, status, err := c.Customers(CustomersRequest{ + data, _, err := c.Customers(CustomersRequest{ Filter: CustomersFilter{ Ids: []string{codeFail}, }, @@ -251,10 +235,6 @@ func TestClient_CustomersCustomers_Fail(t *testing.T) { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -360,15 +340,11 @@ func TestClient_CustomerChange(t *testing.T) { } }`) - data, status, err := c.Customer(f.ExternalID, ByExternalID, "") + data, _, err := c.Customer(f.ExternalID, ByExternalID, "") if err != nil { t.Errorf("%v", err) } - if status >= http.StatusBadRequest { - t.Errorf("%v", err) - } - if data.Success != true { t.Errorf("%v", err) } @@ -449,15 +425,11 @@ func TestClient_CustomerChange_Fail(t *testing.T) { Reply(404). BodyString(`{"success": false, "errorMsg": "Not found"}`) - data, status, err := c.Customer(codeFail, ByExternalID, "") + data, _, err := c.Customer(codeFail, ByExternalID, "") if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -524,15 +496,11 @@ func TestClient_CustomersUpload_Fail(t *testing.T) { Reply(460). BodyString(`{"success": false, "errorMsg": "Customers are loaded with errors"}`) - data, status, err := c.CustomersUpload(customers) + data, _, err := c.CustomersUpload(customers) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -598,15 +566,11 @@ func TestClient_CustomersCombine_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) - data, status, err := c.CustomersCombine([]Customer{{}, {}}, Customer{}) + data, _, err := c.CustomersCombine([]Customer{{}, {}}, Customer{}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -669,15 +633,11 @@ func TestClient_CustomersFixExternalIds_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"id": "ID must be an integer"}}`) - data, status, err := c.CustomersFixExternalIds(customers) + data, _, err := c.CustomersFixExternalIds(customers) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -732,15 +692,11 @@ func TestClient_CustomersHistory_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) - data, status, err := c.CustomersHistory(f) + data, _, err := c.CustomersHistory(f) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -931,15 +887,11 @@ func TestClient_CorporateCustomersFixExternalIds_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"id": "ID must be an integer"}}`) - data, status, err := c.CorporateCustomersFixExternalIds(customers) + data, _, err := c.CorporateCustomersFixExternalIds(customers) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -994,15 +946,11 @@ func TestClient_CorporateCustomersHistory_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) - data, status, err := c.CorporateCustomersHistory(f) + data, _, err := c.CorporateCustomersHistory(f) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -1184,15 +1132,11 @@ func TestClient_CorporateCustomersUpload_Fail(t *testing.T) { Reply(460). BodyString(`{"success": false, "errorMsg": "Customers are loaded with errors"}`) - data, status, err := c.CorporateCustomersUpload(customers) + data, _, err := c.CorporateCustomersUpload(customers) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -1761,17 +1705,13 @@ func TestClient_NotesNotes_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[createdAtFrom]": "This value is not valid."}}`) - data, status, err := c.CustomerNotes(NotesRequest{ + data, _, err := c.CustomerNotes(NotesRequest{ Filter: NotesFilter{CreatedAtFrom: "2020-13-12"}, }) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -1865,15 +1805,11 @@ func TestClient_NotesCreateDelete_Fail(t *testing.T) { Reply(400). 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) + data, _, err := c.CustomerNoteCreate(note) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -1941,15 +1877,11 @@ func TestClient_OrdersOrders_Fail(t *testing.T) { Reply(400). 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}}) + data, _, err := c.Orders(OrdersRequest{Filter: OrdersFilter{Attachments: 7}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2156,15 +2088,11 @@ func TestClient_OrderChange_Fail(t *testing.T) { Reply(404). BodyString(`{"success": false, "errorMsg": "Not found map"}`) - data, status, err := c.OrderEdit(f, ByID) + data, _, err := c.OrderEdit(f, ByID) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2240,15 +2168,11 @@ func TestClient_OrdersUpload_Fail(t *testing.T) { Reply(460). BodyString(`{"success": false, "errorMsg": "Orders are loaded with errors"}`) - data, status, err := c.OrdersUpload(orders) + data, _, err := c.OrdersUpload(orders) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2308,13 +2232,10 @@ func TestClient_OrdersCombine_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) - data, status, err := c.OrdersCombine("ours", Order{}, Order{}) + data, _, err := c.OrdersCombine("ours", Order{}, Order{}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } if data.Success != false { t.Error(successFail) @@ -2376,15 +2297,11 @@ func TestClient_OrdersFixExternalIds_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Invalid input parameters"}`) - data, status, err := c.OrdersFixExternalIds(orders) + data, _, err := c.OrdersFixExternalIds(orders) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2480,15 +2397,11 @@ func TestClient_OrdersHistory_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters", "errors": {"children[startDate]": "Значение недопустимо."}}`) - data, status, err := c.OrdersHistory(OrdersHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) + data, _, err := c.OrdersHistory(OrdersHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2610,15 +2523,11 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { Reply(400). 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) + data, _, err := c.OrderPaymentCreate(f) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2669,10 +2578,6 @@ func TestClient_PaymentCreateEditDelete_Fail(t *testing.T) { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if paymentDeleteResponse.Success != false { t.Error(successFail) } @@ -2726,15 +2631,11 @@ func TestClient_TasksTasks_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.Tasks(f) + data, _, err := c.Tasks(f) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2844,15 +2745,11 @@ func TestClient_TaskChange_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Task is not loaded", "errors": {"performerId": "This value should not be blank."}}`) - data, status, err := c.TaskEdit(f) + data, _, err := c.TaskEdit(f) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2897,15 +2794,11 @@ func TestClient_UsersUsers_Fail(t *testing.T) { Reply(400). 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}) + data, _, err := c.Users(UsersRequest{Filter: UsersFilter{Active: 3}, Page: 1}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -2946,15 +2839,11 @@ func TestClient_UsersUser_Fail(t *testing.T) { Reply(404). BodyString(`{"success": false, "errorMsg": "Not found"}`) - data, status, err := c.User(iCodeFail) + data, _, err := c.User(iCodeFail) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -3031,15 +2920,11 @@ func TestClient_UsersUpdate_Fail(t *testing.T) { Reply(404). BodyString(`{"success": false, "errorMsg": "Not found"}`) - data, status, err := c.UserStatus(iCodeFail, "busy") + data, _, err := c.UserStatus(iCodeFail, "busy") if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -3614,15 +3499,11 @@ func TestClient_CostGroupItemEdit_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.CostGroupEdit(costGroup) + data, _, err := c.CostGroupEdit(costGroup) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -4879,10 +4760,6 @@ func TestClient_PackChange_Fail(t *testing.T) { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if s.Success != false { t.Error(successFail) } @@ -4905,10 +4782,6 @@ func TestClient_PackChange_Fail(t *testing.T) { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if e.Success != false { t.Error(successFail) } @@ -4924,10 +4797,6 @@ func TestClient_PackChange_Fail(t *testing.T) { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if d.Success != false { t.Error(successFail) } @@ -4974,15 +4843,11 @@ func TestClient_PacksHistory_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.PacksHistory(PacksHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) + data, _, err := c.PacksHistory(PacksHistoryRequest{Filter: OrdersHistoryFilter{StartDate: "2020-13-12"}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -5025,15 +4890,11 @@ func TestClient_Packs_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.Packs(PacksRequest{Filter: PacksFilter{ShipmentDateFrom: "2020-13-12"}}) + data, _, err := c.Packs(PacksRequest{Filter: PacksFilter{ShipmentDateFrom: "2020-13-12"}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -5077,15 +4938,11 @@ func TestClient_Inventories_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.Inventories(InventoriesRequest{Filter: InventoriesFilter{Sites: []string{codeFail}}}) + data, _, err := c.Inventories(InventoriesRequest{Filter: InventoriesFilter{Sites: []string{codeFail}}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -5180,15 +5037,11 @@ func TestClient_Segments_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.Segments(SegmentsRequest{Filter: SegmentsFilter{Active: 3}}) + data, _, err := c.Segments(SegmentsRequest{Filter: SegmentsFilter{Active: 3}}) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -5312,10 +5165,6 @@ func TestClient_IntegrationModule_Fail(t *testing.T) { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if g.Success != false { t.Error(successFail) } @@ -5738,15 +5587,11 @@ func TestClient_Cost_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Cost is not loaded"}`) - data, status, err := c.CostCreate(costRecord) + data, _, err := c.CostCreate(costRecord) if err == nil { t.Error("Error must be return") } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if err == nil { t.Errorf("%v", err) } @@ -5784,10 +5629,6 @@ func TestClient_Cost_Fail(t *testing.T) { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if cost.Success != false { t.Error(successFail) } @@ -5815,10 +5656,6 @@ func TestClient_Cost_Fail(t *testing.T) { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if costEdit.Success != false { t.Error(successFail) } @@ -5840,10 +5677,6 @@ func TestClient_Cost_Fail(t *testing.T) { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if costDelete.Success != false { t.Error(successFail) } @@ -5962,15 +5795,11 @@ func TestClient_CostsUpload_Fail(t *testing.T) { Reply(460). BodyString(`{"success": false, "errorMsg": "Costs are loaded with errors"}`) - data, status, err := c.CostsUpload(costsUpload) + data, _, err := c.CostsUpload(costsUpload) if err == nil { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -6175,23 +6004,15 @@ func TestClient_FileDelete(t *testing.T) { t.Errorf("%v", err) } - data, status, err = c.FileDelete(badRequest) + data, _, err = c.FileDelete(badRequest) if err == nil { t.Errorf("%v", err) } - if status != http.StatusBadRequest { - t.Errorf("status should be `%d`, got `%d` instead", http.StatusBadRequest, status) - } - - data, status, err = c.FileDelete(notFound) + data, _, err = c.FileDelete(notFound) if err == nil { t.Errorf("%v", err) } - - if status != http.StatusNotFound { - t.Errorf("status should be `%d`, got `%d` instead", http.StatusNotFound, status) - } } func TestClient_FileDownload(t *testing.T) { @@ -6221,9 +6042,9 @@ func TestClient_FileDownload(t *testing.T) { t.Errorf("%v", err) } - fetchedByte, errr := ioutil.ReadAll(data) - if errr != nil { - t.Error(errr) + fetchedByte, err := ioutil.ReadAll(data) + if err != nil { + t.Error(err) } fetched := string(fetchedByte) @@ -6232,7 +6053,7 @@ func TestClient_FileDownload(t *testing.T) { } data, status, err = c.FileDownload(fail) - if err != nil { + if err == nil { t.Errorf("%v", err) } @@ -6280,9 +6101,9 @@ func TestClient_FileEdit(t *testing.T) { t.Errorf("filename should be `%s`, got `%s` instead", resp.File.Filename, data.File.Filename) } - data, status, err = c.FileEdit(fail, *resp.File) - if status != http.StatusNotFound { - t.Errorf("status should be `%d`, got `%d` instead", http.StatusNotFound, status) + data, _, err = c.FileEdit(fail, *resp.File) + if err == nil { + t.Errorf("%v", err) } } @@ -6322,15 +6143,11 @@ func TestClient_CustomFields_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.CustomFields(CustomFieldsRequest{Filter: CustomFieldsFilter{Type: codeFail}}) + data, _, err := c.CustomFields(CustomFieldsRequest{Filter: CustomFieldsFilter{Type: codeFail}}) if err == nil { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -6490,7 +6307,7 @@ func TestClient_CustomDictionariesCreate_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.CustomDictionariesCreate(customDictionary) + data, _, err := c.CustomDictionariesCreate(customDictionary) if err == nil { t.Errorf("%v", err) } @@ -6665,15 +6482,11 @@ func TestClient_CustomFieldsCreate_Fail(t *testing.T) { Reply(400). BodyString(`{"success": false, "errorMsg": "Errors in the input parameters"}`) - data, status, err := c.CustomFieldsCreate(customFields) + data, _, err := c.CustomFieldsCreate(customFields) if err == nil { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if data.Success != false { t.Error(successFail) } @@ -6716,10 +6529,6 @@ func TestClient_CustomFieldsCreate_Fail(t *testing.T) { t.Errorf("%v", err) } - if status < http.StatusBadRequest { - t.Error(statusFail) - } - if customFieldEdit.Success != false { t.Error(successFail) } diff --git a/v5/error.go b/v5/error.go index 0d8fdf3..cbdc9df 100644 --- a/v5/error.go +++ b/v5/error.go @@ -19,7 +19,7 @@ func (e *APIError) Error() string { func NewAPIError(dataResponse []byte) error { a := &APIError{} - if dataResponse[0] == '<' { + if len(dataResponse) > 0 && dataResponse[0] == '<' { a.ErrorMsg = "Account does not exist." return a }