Better tests (check that response match the structure) (#52)

Trailing zeros were removed from time in responses because of json marshaling features

README.md

@@ -36,7 +36,8 @@ func main() {
 	client := ozon.NewClient("my-client-id", "my-api-key")
 
 	// Send request with parameters
-	resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
+	ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
 		ProductId: 123456789,
 	})
 	if err != nil || resp.StatusCode != http.StatusOK {

client.go

@@ -15,36 +15,33 @@ type HttpClient interface {
 
 type Client struct {
 	baseUrl string
-	ctx     context.Context
 	Options map[string]string
 
 	client HttpClient
 }
 
-func NewClient(baseUrl string, opts map[string]string) *Client {
+func NewClient(client HttpClient, baseUrl string, opts map[string]string) *Client {
 	return &Client{
 		Options: opts,
-		ctx:     context.Background(),
+		client:  client,
-		client:  http.DefaultClient,
 		baseUrl: baseUrl,
 	}
 }
 
 func NewMockClient(handler http.HandlerFunc) *Client {
 	return &Client{
-		ctx:    context.Background(),
 		client: NewMockHttpClient(handler),
 	}
 }
 
-func (c Client) newRequest(method string, url string, body interface{}) (*http.Request, error) {
+func (c Client) newRequest(ctx context.Context, method string, url string, body interface{}) (*http.Request, error) {
 	bodyJson, err := json.Marshal(body)
 	if err != nil {
 		return nil, err
 	}
 
 	url = c.baseUrl + url
-	req, err := http.NewRequestWithContext(c.ctx, method, url, bytes.NewBuffer(bodyJson))
+	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(bodyJson))
 	if err != nil {
 		return nil, err
 	}
@@ -56,8 +53,8 @@ func (c Client) newRequest(method string, url string, body interface{}) (*http.R
 	return req, nil
 }
 
-func (c Client) Request(method string, path string, req, resp interface{}, options map[string]string) (*Response, error) {
+func (c Client) Request(ctx context.Context, method string, path string, req, resp interface{}, options map[string]string) (*Response, error) {
-	httpReq, err := c.newRequest(method, path, req)
+	httpReq, err := c.newRequest(ctx, method, path, req)
 	if err != nil {
 		return nil, err
 	}

client_test.go

@@ -1,8 +1,14 @@
 package core
 
 import (
+	"context"
 	"net/http"
 	"testing"
+	"time"
+)
+
+const (
+	testTimeout = 5 * time.Second
 )
 
 type TestRequestRequest struct {
@@ -55,10 +61,12 @@ func TestRequest(t *testing.T) {
 		c := NewMockClient(NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
 		respStruct := &TestRequestResponse{}
-		resp, err := c.Request(http.MethodPost, "/", test.params, respStruct, nil)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Request(ctx, http.MethodPost, "/", test.params, respStruct, nil)
 
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {

ozon/analytics.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -19,6 +20,21 @@ type GetAnalyticsDataParams struct {
 	DateTo time.Time `json:"date_to"`
 
 	// Items Enum: "unknownDimension" "sku" "spu" "day" "week" "month" "year" "category1" "category2" "category3" "category4" "brand" "modelID"
+	// Data grouping available to all sellers:
+	//   - unknownDimension—unknown,
+	//   - sku—product identifier,
+	//   - spu—product identifier,
+	//   - day—day,
+	//   - week—week,
+	//   - month—month.
+	// Data grouping available to sellers with Premium subscription:
+	//   - year—year,
+	//   - category1—first level category,
+	//   - category2—second level category,
+	//   - category3—third level category,
+	//   - category4—fourth level category,
+	//   - brand—brand,
+	//   - modelID—model.
 	Dimension []GetAnalyticsDataDimension `json:"dimension"`
 
 	// Filters
@@ -30,6 +46,30 @@ type GetAnalyticsDataParams struct {
 	Limit int64 `json:"limit"`
 
 	// Specify up to 14 metrics. If there are more, you will get an error with the InvalidArgument code
+	// The list of metrics for which the report will be generated.
+	//
+	// Metrics available to all sellers:
+	//
+	// 	 - revenue—ordered amount,
+	//   - ordered_units—ordered products.
+	// Metrics available to sellers with Premium subscription:
+	//   - unknown_metric—unknown metric,
+	//   - hits_view_search—impressions in search and category,
+	//   - hits_view_pdp—impressions on the product description page,
+	//   - hits_view—total impressions,
+	//   - hits_tocart_search—added to cart from search or category,
+	//   - hits_tocart_pdp—added to cart from the product description page,
+	//   - hits_tocart—added to cart total,
+	//   - session_view_search—sessions with impressions in search or category,
+	//   - session_view_pdp—sessions with impressions on the product description page,
+	//   - session_view—sessions total,
+	//   - conv_tocart_search—conversion to cart from search or category,
+	//   - conv_tocart_pdp—conversion to cart from a product description page,
+	//   - conv_tocart—total conversion to cart,
+	//   - returns—returned products,
+	//   - cancellations—canceled products,
+	//   - delivered_units—delivered products,
+	//   - position_category—position in search and category.
 	Metrics []GetAnalyticsDataFilterMetric `json:"metrics"`
 
 	// Number of elements that will be skipped in the response. For example, if `offset=10`, the response will start with the 11th element found
@@ -94,12 +134,19 @@ type GetAnalyticsDataResultDimension struct {
 }
 
 // Specify the period and metrics that are required. The response will contain analytical data grouped by the `dimensions` parameter.
-func (c Analytics) GetAnalyticsData(params *GetAnalyticsDataParams) (*GetAnalyticsDataResponse, error) {
+//
+// There are restrictions for sellers without Premium subscription:
+//
+//   - data is available for the last 3 months,
+//   - some of the data grouping methods and metrics aren't available.
+//
+// There are no restrictions for sellers with Premium subscription
+func (c Analytics) GetAnalyticsData(ctx context.Context, params *GetAnalyticsDataParams) (*GetAnalyticsDataResponse, error) {
 	url := "/v1/analytics/data"
 
 	resp := &GetAnalyticsDataResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -157,12 +204,12 @@ type GetStocksOnWarehousesResultRow struct {
 }
 
 // Report on stocks and products movement at Ozon warehouses
-func (c Analytics) GetStocksOnWarehouses(params *GetStocksOnWarehousesParams) (*GetStocksOnWarehousesResponse, error) {
+func (c Analytics) GetStocksOnWarehouses(ctx context.Context, params *GetStocksOnWarehousesParams) (*GetStocksOnWarehousesResponse, error) {
 	url := "/v2/analytics/stock_on_warehouses"
 
 	resp := &GetStocksOnWarehousesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/analytics_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -24,7 +25,7 @@ func TestGetAnalyticsData(t *testing.T) {
 				DateFrom:  core.TimeFromString(t, "2006-01-02", "2020-09-01"),
 				DateTo:    core.TimeFromString(t, "2006-01-02", "2021-10-15"),
 				Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
-				Metrics:   []GetAnalyticsDataFilterMetric{AdvViewAll},
+				Metrics:   []GetAnalyticsDataFilterMetric{HistViewPDP},
 				Sort: []GetAnalyticsDataSort{
 					{
 						Key:   HistViewPDP,
@@ -59,11 +60,15 @@ func TestGetAnalyticsData(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Analytics().GetAnalyticsData(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Analytics().GetAnalyticsData(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetAnalyticsDataResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -119,11 +124,15 @@ func TestGetStocksOnWarehouses(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Analytics().GetStocksOnWarehouses(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Analytics().GetStocksOnWarehouses(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetStocksOnWarehousesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/barcodes.go

@@ -0,0 +1,111 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+type Barcodes struct {
+	client *core.Client
+}
+
+type GenerateBarcodesParams struct {
+	// List of products for which you want to generate barcodes
+	ProductIds []int64 `json:"product_ids"`
+}
+
+type GenerateBarcodesResponse struct {
+	core.CommonResponse
+
+	Errors []GenerateBarcodesError `json:"errors"`
+}
+
+type GenerateBarcodesError struct {
+	// Error code
+	Code string `json:"code"`
+
+	// Error details
+	Error string `json:"error"`
+
+	// Barcode that is failed to generate
+	Barcode string `json:"barcode"`
+
+	// Product identifier for which the barcode generation failed
+	ProductId int64 `json:"product_id"`
+}
+
+// If a product doesn't have a barcode, you can create it using this method. If a barcode already exists,
+// but it isn't specified in your account, you can bind it using the `/v1/barcode/add` method.
+//
+// You can't generate barcodes for more than 100 products per request.
+// You can use the method no more than 20 times per minute.
+func (b *Barcodes) Generate(ctx context.Context, params *GenerateBarcodesParams) (*GenerateBarcodesResponse, error) {
+	url := "/v1/barcode/generate"
+
+	resp := &GenerateBarcodesResponse{}
+
+	response, err := b.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type BindBarcodesParams struct {
+	// List of barcodes and products
+	Barcodes []BindBarcode `json:"barcodes"`
+}
+
+type BindBarcode struct {
+	// Barcode. Maximum 100 characters
+	Barcode string `json:"barcode"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+}
+
+type BindBarcodesResponse struct {
+	core.CommonResponse
+
+	// Errors while binding barcodes
+	Errors []BindBarcodesError `json:"errors"`
+}
+
+type BindBarcodesError struct {
+	// Error code
+	Code string `json:"code"`
+
+	// Error details
+	Error string `json:"error"`
+
+	// Barcode that is failed to generate
+	Barcode string `json:"barcode"`
+
+	// SKU of the product for which the barcode binding failed
+	SKU int64 `json:"sku"`
+}
+
+// If a product has a barcode that isn't specified in your account,
+// bind it using this method. If a product doesn't have a barcode,
+// you can create it using the `/v1/barcode/generate` method.
+//
+// You can't bind barcodes to more than 100 products per request.
+// Each product can have up to 100 barcodes.
+// You can use the method no more than 20 times per minute.
+func (b *Barcodes) Bind(ctx context.Context, params *BindBarcodesParams) (*BindBarcodesResponse, error) {
+	url := "/v1/barcode/add"
+
+	resp := &BindBarcodesResponse{}
+
+	response, err := b.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}

ozon/barcodes_test.go

@@ -0,0 +1,147 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+func TestGenerateBarcodes(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GenerateBarcodesParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GenerateBarcodesParams{
+				ProductIds: []int64{123456789},
+			},
+			`{
+				"errors": [
+				  {
+					"code": "code 200",
+					"error": "no error",
+					"barcode": "456",
+					"product_id": 123456789
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GenerateBarcodesParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Barcodes().Generate(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GenerateBarcodesResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if resp.StatusCode == http.StatusOK {
+			if len(resp.Errors) != 0 {
+				if resp.Errors[0].ProductId != test.params.ProductIds[0] {
+					t.Errorf("Product ids are not equal")
+				}
+			}
+		}
+	}
+}
+
+func TestBindBarcodes(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *BindBarcodesParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&BindBarcodesParams{
+				Barcodes: []BindBarcode{
+					{
+						Barcode: "some barcode",
+						SKU:     123456789,
+					},
+				},
+			},
+			`{
+				"errors": [
+				  {
+					"code": "code 200",
+					"error": "no error",
+					"barcode": "some barcode",
+					"sku": 123456789
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&BindBarcodesParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Barcodes().Bind(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &BindBarcodesResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if resp.StatusCode == http.StatusOK {
+			if len(resp.Errors) != 0 {
+				if resp.Errors[0].Barcode != test.params.Barcodes[0].Barcode {
+					t.Errorf("Barcodes are not equal")
+				}
+				if resp.Errors[0].SKU != test.params.Barcodes[0].SKU {
+					t.Errorf("Barcodes are not equal")
+				}
+			}
+		}
+	}
+}

ozon/brands.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 
 	core "github.com/diphantxm/ozon-api-client"
@@ -44,12 +45,12 @@ type ListCertifiedBrandsResultCertificate struct {
 }
 
 // List of certified brands
-func (c Brands) List(params *ListCertifiedBrandsParams) (*ListCertifiedBrandsResponse, error) {
+func (c Brands) List(ctx context.Context, params *ListCertifiedBrandsParams) (*ListCertifiedBrandsResponse, error) {
 	url := "/v1/brand/company-certification/list"
 
 	resp := &ListCertifiedBrandsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/brands_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -28,7 +29,6 @@ func TestListCertifiedBrands(t *testing.T) {
 				"result": {
 				  "brand_certification": [
 					{
-					  "brand_id": 135476863,
 					  "brand_name": "Sea of Spa",
 					  "has_certificate": false
 					}
@@ -52,11 +52,15 @@ func TestListCertifiedBrands(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Brands().List(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Brands().List(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListCertifiedBrandsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/cancellations.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -81,12 +82,12 @@ type CancellationInfoState struct {
 }
 
 // Method for getting information about a rFBS cancellation request
-func (c Cancellations) GetInfo(params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
+func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
 	url := "/v1/delivery-method/list"
 
 	resp := &GetCancellationInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -153,12 +154,12 @@ type ListCancellationResponseCounters struct {
 }
 
 // Method for getting a list of rFBS cancellation requests
-func (c Cancellations) List(params *ListCancellationsParams) (*ListCancellationsResponse, error) {
+func (c Cancellations) List(ctx context.Context, params *ListCancellationsParams) (*ListCancellationsResponse, error) {
 	url := "/v1/conditional-cancellation/list"
 
 	resp := &ListCancellationsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -181,12 +182,12 @@ type ApproveRejectCancellationsResponse struct {
 
 // The method allows to approve an rFBS cancellation request in the ON_APPROVAL status.
 // The order will be canceled and the money will be returned to the customer
-func (c Cancellations) Approve(params *ApproveRejectCancellationsParams) (*ApproveRejectCancellationsResponse, error) {
+func (c Cancellations) Approve(ctx context.Context, params *ApproveRejectCancellationsParams) (*ApproveRejectCancellationsResponse, error) {
 	url := "/v1/conditional-cancellation/approve"
 
 	resp := &ApproveRejectCancellationsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -198,12 +199,12 @@ func (c Cancellations) Approve(params *ApproveRejectCancellationsParams) (*Appro
 // The method allows to reject an rFBS cancellation request in the ON_APPROVAL status. Explain your decision in the comment parameter.
 //
 // The order will remain in the same status and must be delivered to the customer
-func (c Cancellations) Reject(params *ApproveRejectCancellationsParams) (*ApproveRejectCancellationsResponse, error) {
+func (c Cancellations) Reject(ctx context.Context, params *ApproveRejectCancellationsParams) (*ApproveRejectCancellationsResponse, error) {
 	url := "/v1/conditional-cancellation/reject"
 
 	resp := &ApproveRejectCancellationsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/cancellations_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -62,11 +63,15 @@ func TestGetCancellationInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Cancellations().GetInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Cancellations().GetInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetCancellationInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -121,9 +126,9 @@ func TestListCancellations(t *testing.T) {
 					  "state": "APPROVED"
 					},
 					"cancellation_initiator": "CLIENT",
-					"order_date": "2021-09-03T07:04:53.220Z",
+					"order_date": "2021-09-03T07:04:53.22Z",
 					"approve_comment": "",
-					"approve_date": "2021-09-03T09:13:12.614200Z",
+					"approve_date": "2021-09-03T09:13:12.6142Z",
 					"auto_approve_date": "2021-09-06T07:17:12.116114Z"
 				  },
 				  {
@@ -171,11 +176,15 @@ func TestListCancellations(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Cancellations().List(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Cancellations().List(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListCancellationsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -215,11 +224,15 @@ func TestApproveCancellations(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Cancellations().Approve(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Cancellations().Approve(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ApproveRejectCancellationsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -259,11 +272,15 @@ func TestRejectCancellations(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Cancellations().Reject(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Cancellations().Reject(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ApproveRejectCancellationsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/categories.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 
 	core "github.com/diphantxm/ozon-api-client"
@@ -11,17 +12,14 @@ type Categories struct {
 }
 
 type GetProductTreeParams struct {
-	// Category identifier
-	CategoryId int64 `json:"category_id"`
-
 	// Response language
-	Language Language `json:"language" default:"DEFAULT"`
+	Language Language `json:"language"`
 }
 
 type GetProductTreeResponse struct {
 	core.CommonResponse
 
-	// Category list
+	// Categories list
 	Result []GetProductTreeResult `json:"result"`
 }
 
@@ -29,23 +27,33 @@ type GetProductTreeResult struct {
 	// Category identifier
 	CategoryId int64 `json:"category_id"`
 
-	// Subcategory tree
-	Children []GetProductTreeResponse `json:"children"`
-
 	// Category name
-	Title string `json:"title"`
+	CategoryName string `json:"category_name"`
+
+	// `true`, if you can't create products in the category. `false`, if you can
+	Disabled bool `json:"disabled"`
+
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
+
+	// Product type name
+	TypeName string `json:"type_name"`
+
+	// Subcategory tree
+	Children []GetProductTreeResult `json:"children"`
 }
 
 // Returns product categories in the tree view.
+//
 // New products can be created in the last level categories only.
 // This means that you need to match these particular categories with the categories of your site.
-// It is not possible to create categories by user request
+// We don't create new categories by user request.
-func (c Categories) Tree(params *GetProductTreeParams) (*GetProductTreeResponse, error) {
+func (c *Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*GetProductTreeResponse, error) {
-	url := "/v2/category/tree"
+	url := "/v1/description-category/tree"
 
 	resp := &GetProductTreeResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -55,14 +63,14 @@ func (c Categories) Tree(params *GetProductTreeParams) (*GetProductTreeResponse,
 }
 
 type GetCategoryAttributesParams struct {
-	// Filter by characteristics
-	AttributeType AttributeType `json:"attribute_type" default:"ALL"`
-
 	// Category identifier
-	CategoryId []int64 `json:"category_id"`
+	CategoryId int64 `json:"category_id"`
 
 	// Response language
-	Language Language `json:"language" default:"DEFAULT"`
+	Language Language `json:"language"`
+
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
 }
 
 type GetCategoryAttributesResponse struct {
@@ -73,19 +81,6 @@ type GetCategoryAttributesResponse struct {
 }
 
 type GetCategoryAttributesResult struct {
-	// Array of product characteristics
-	Attributes []GetCategoryAttributesResultAttribute `json:"attributes"`
-
-	// Category identifier
-	CategoryId int64 `json:"category_id"`
-}
-
-type GetCategoryAttributesResultAttribute struct {
-	// Indication that the dictionary attribute values depend on the category:
-	//   - true — the attribute has its own set of values for each category.
-	//   - false — the attribute has the same set of values for all categories
-	CategoryDependent bool `json:"category_dependent"`
-
 	// Characteristic description
 	Description string `json:"description"`
 
@@ -98,26 +93,29 @@ type GetCategoryAttributesResultAttribute struct {
 	// Characteristics group name
 	GroupName string `json:"group_name"`
 
-	// Document generation task number
+	// Number of document generation task
 	Id int64 `json:"id"`
 
 	// Indicates that the attribute is aspect. An aspect attribute is a characteristic that distinguishes products of the same model.
 	//
-	// For example, clothes and shoes of the same model may have different colors and sizes. That is, color and size are aspect attributes.
+	// For example, clothes or shoes of the same model may have different colors and sizes. That is, color and size are aspect attributes.
 	//
 	// Values description:
-	//   - true — the attribute is aspect and cannot be changed after the products are delivered to the warehouse or sold from the seller's warehouse.
+	//
-	//   - false — the attribute is not aspect and can be changed at any time
+	// 	- `true`—the attribute is aspect and can't be changed after the products are delivered to the warehouse or sold from the seller's warehouse.
+	// 	- `false`—the attribute is not aspect and can be changed at any time
 	IsAspect bool `json:"is_aspect"`
 
 	// Indicates that the characteristic is a set of values:
-	//   - true — the characteristic is a set of values,
+	//
-	//   - false — the characteristic consists of a single value
+	// 	- `true`—the characteristic is a set of values,
+	// 	- `false`—the characteristic consists of a single value
 	IsCollection bool `json:"is_collection"`
 
 	// Indicates that the characteristic is mandatory:
-	//   - true — a mandatory characteristic,
+	//
-	//   - false — you can leave the characteristic out
+	// 	- `true`—a mandatory characteristic,
+	// 	- `false`—an optional characteristic
 	IsRequired bool `json:"is_required"`
 
 	// Name
@@ -127,19 +125,17 @@ type GetCategoryAttributesResultAttribute struct {
 	Type string `json:"type"`
 }
 
-// Getting characteristics for specified product category.
+// Getting characteristics for specified product category and type.
 //
-// Pass up to 20 category identifiers in the `category_id` list.
+// If the dictionary_id value is 0, there is no directory.
-//
+// If the value is different, there are directories.
-// You can check whether the attribute has a nested directory by the `dictionary_id` parameter.
+// Get them using the `/v1/description-category/attribute/values` method.
-// The 0 value means there is no directory. If the value is different, then there are directories.
+func (c *Categories) Attributes(ctx context.Context, params *GetCategoryAttributesParams) (*GetCategoryAttributesResponse, error) {
-// You can get them using the `/v2/category/attribute/values` method
+	url := "/v1/description-category/attribute"
-func (c Categories) Attributes(params *GetCategoryAttributesParams) (*GetCategoryAttributesResponse, error) {
-	url := "/v3/category/attribute"
 
 	resp := &GetCategoryAttributesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -156,43 +152,59 @@ type GetAttributeDictionaryParams struct {
 	CategoryId int64 `json:"category_id"`
 
 	// Response language
-	// The default language is Russian
+	Language Language `json:"language"`
-	Language Language `json:"language" default:"DEFAULT"`
 
+	// Identifier of the directory to start the response with.
+	// If `last_value_id` is 10, the response will contain directories starting from the 11th
 	LastValueId int64 `json:"last_value_id"`
 
 	// Number of values in the response:
-	//   - maximum — 5000
+	//
-	//   - minimum — 1
+	// 	- maximum—5000,
+	// 	- minimum—1.
 	Limit int64 `json:"limit"`
+
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
 }
 
 type GetAttributeDictionaryResponse struct {
 	core.CommonResponse
 
+	// Indication that only part of characteristic values was returned in the response:
+	//
+	// 	- true—make a request with a new last_value_id parameter value for getting the rest of characteristic values;
+	// 	- false—all characteristic values were returned
 	HasNext bool `json:"has_next"`
 
-	// Method result
+	// Characteristic values
 	Result []GetAttributeDictionaryResult `json:"result"`
 }
 
 type GetAttributeDictionaryResult struct {
-	Id      int64  `json:"id"`
+	// Characteristic value identifier
-	Info    string `json:"info"`
+	Id int64 `json:"id"`
+
+	// Additional description
+	Info string `json:"info"`
+
+	// Image link
 	Picture string `json:"picture"`
 
 	// Product characteristic value
 	Value string `json:"value"`
 }
 
-// You can use the `/v3/category/attribute` method to check if an attribute has a nested directory.
+// Returns characteristics value directory.
-// If there are directories, get them using this method
+//
-func (c Categories) AttributesDictionary(params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
+// To check if an attribute has a nested directory,
-	url := "/v2/category/attribute/values"
+// use the `/v1/description-category/attribute` method.
+func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
+	url := "/v1/description-category/attribute"
 
 	resp := &GetAttributeDictionaryResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/categories_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -21,14 +22,17 @@ func TestGetProductTree(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetProductTreeParams{
-				CategoryId: 17034410,
+				Language: English,
 			},
 			`{
 				"result": [
 				  {
-					"category_id": 17034410,
+					"category_id": 0,
-					"title": "Развивающие игрушки",
+					"category_name": "string",
-					"children": []
+					"children": [],
+					"disabled": true,
+					"type_id": 0,
+					"type_name": "string"
 				  }
 				]
 			}`,
@@ -48,22 +52,18 @@ func TestGetProductTree(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Categories().Tree(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Categories().Tree(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductTreeResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
-
-		if resp.StatusCode == http.StatusOK {
-			if len(resp.Result) > 0 {
-				if resp.Result[0].CategoryId != test.params.CategoryId {
-					t.Errorf("First category ids in request and response are not equal")
-				}
-			}
-		}
 	}
 }
 
@@ -81,25 +81,23 @@ func TestGetCategoryAttributes(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetCategoryAttributesParams{
-				CategoryId: []int64{17034410},
+				CategoryId: 12345,
+				Language:   English,
+				TypeId:     2,
 			},
 			`{
 				"result": [
 				  {
-					"category_id": 17034410,
+					"description": "string",
-					"attributes": [
+					"dictionary_id": 0,
-					  {
+					"group_id": 0,
-						"id": 85,
+					"group_name": "string",
-						"name": "Бренд",
+					"id": 0,
-						"description": "Укажите наименование бренда, под которым произведен товар. Если товар не имеет бренда, используйте значение \"Нет бренда\"",
+					"is_aspect": true,
-						"type": "String",
+					"is_collection": true,
-						"is_collection": false,
+					"is_required": true,
-						"is_required": true,
+					"name": "string",
-						"group_id": 0,
+					"type": "string"
-						"group_name": "",
-						"dictionary_id": 28732849
-					  }
-					]
 				  }
 				]
 			}`,
@@ -119,25 +117,18 @@ func TestGetCategoryAttributes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Categories().Attributes(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Categories().Attributes(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetCategoryAttributesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
-
-		if resp.StatusCode == http.StatusOK {
-			if len(resp.Result) != len(test.params.CategoryId) {
-				t.Errorf("Length of categories in request and response are not equal")
-			}
-			if len(resp.Result) > 0 {
-				if resp.Result[0].CategoryId != test.params.CategoryId[0] {
-					t.Errorf("Category ids in request and response are not equal")
-				}
-			}
-		}
 	}
 }
 
@@ -155,33 +146,23 @@ func TestGetAttributeDictionary(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetAttributeDictionaryParams{
-				AttributeId: 10096,
+				AttributeId: 123456,
-				CategoryId:  17028968,
+				CategoryId:  12,
-				LastValueId: 0,
+				Language:    English,
-				Limit:       3,
+				LastValueId: 1,
+				Limit:       5,
+				TypeId:      6,
 			},
 			`{
+				"has_next": true,
 				"result": [
 				  {
-					"id": 61571,
+					"id": 0,
-					"value": "белый",
+					"info": "string",
-					"info": "",
+					"picture": "string",
-					"picture": ""
+					"value": "string"
-				  },
-				  {
-					"id": 61572,
-					"value": "прозрачный",
-					"info": "",
-					"picture": ""
-				  },
-				  {
-					"id": 61573,
-					"value": "бежевый",
-					"info": "",
-					"picture": ""
 				  }
-				],
+				]
-				"has_next": true
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -199,11 +180,15 @@ func TestGetAttributeDictionary(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Categories().AttributesDictionary(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Categories().AttributesDictionary(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetAttributeDictionaryResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/certificates.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -43,12 +44,12 @@ type ListOfAccordanceTypesResultHazard struct {
 }
 
 // List of accordance types (version 2)
-func (c Certificates) ListOfAccordanceTypes() (*ListOfAccordanceTypesResponse, error) {
+func (c Certificates) ListOfAccordanceTypes(ctx context.Context) (*ListOfAccordanceTypesResponse, error) {
 	url := "/v2/product/certificate/accordance-types/list"
 
 	resp := &ListOfAccordanceTypesResponse{}
 
-	response, err := c.client.Request(http.MethodGet, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -73,12 +74,12 @@ type DirectoryOfDocumentTypesResult struct {
 }
 
 // Directory of document types
-func (c Certificates) DirectoryOfDocumentTypes() (*DirectoryOfDocumentTypesResponse, error) {
+func (c Certificates) DirectoryOfDocumentTypes(ctx context.Context) (*DirectoryOfDocumentTypesResponse, error) {
 	url := "/v1/product/certificate/types"
 
 	resp := &DirectoryOfDocumentTypesResponse{}
 
-	response, err := c.client.Request(http.MethodGet, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -99,7 +100,7 @@ type ListOfCertifiedCategoriesResponse struct {
 	core.CommonResponse
 
 	// Method result
-	Result ListOfCertifiedCategoriesResult `json:"reult"`
+	Result ListOfCertifiedCategoriesResult `json:"result"`
 }
 
 type ListOfCertifiedCategoriesResult struct {
@@ -119,12 +120,12 @@ type ListOfCertifiedCategoriesResultCert struct {
 }
 
 // List of certified categories
-func (c Certificates) ListOfCertifiedCategories(params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
+func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
 	url := "/v1/product/certificate/types"
 
 	resp := &ListOfCertifiedCategoriesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -149,12 +150,12 @@ type LinkCertificateToProductResponse struct {
 }
 
 // Link the certificate to the product
-func (c Certificates) LinkToProduct(params *LinkCertificateToProductParams) (*LinkCertificateToProductResponse, error) {
+func (c Certificates) LinkToProduct(ctx context.Context, params *LinkCertificateToProductParams) (*LinkCertificateToProductResponse, error) {
 	url := "/v1/product/certificate/bind"
 
 	resp := &LinkCertificateToProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -186,12 +187,12 @@ type DeleteCertificateResult struct {
 }
 
 // Delete certificate
-func (c Certificates) Delete(params *DeleteCertificateParams) (*DeleteCertificateResponse, error) {
+func (c Certificates) Delete(ctx context.Context, params *DeleteCertificateParams) (*DeleteCertificateResponse, error) {
 	url := "/v1/product/certificate/delete"
 
 	resp := &DeleteCertificateResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -232,7 +233,7 @@ type GetCertificateInfoResult struct {
 	AccordanceTypeCode string `json:"accordance_type_code"`
 
 	// Certificate rejection reason
-	RejectionReasonCode string `json:"rejectio_reason_code"`
+	RejectionReasonCode string `json:"rejection_reason_code"`
 
 	// Moderator's comment
 	VerificationComment string `json:"verification_comment"`
@@ -248,12 +249,12 @@ type GetCertificateInfoResult struct {
 }
 
 // Certificate information
-func (c Certificates) GetInfo(params *GetCertificateInfoParams) (*GetCertificateInfoResponse, error) {
+func (c Certificates) GetInfo(ctx context.Context, params *GetCertificateInfoParams) (*GetCertificateInfoResponse, error) {
 	url := "/v1/product/certificate/info"
 
 	resp := &GetCertificateInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -306,7 +307,7 @@ type ListCertificatesResultCert struct {
 	CertificateName string `json:"certificate_name"`
 
 	// Type
-	TypeCode string `json:"type"`
+	TypeCode string `json:"type_code"`
 
 	// Status
 	StatusCode string `json:"status_code"`
@@ -315,13 +316,13 @@ type ListCertificatesResultCert struct {
 	AccordanceTypecode string `json:"accordance_type_code"`
 
 	// Certificate rejection reason
-	RejectionReasonCode string `json:"rejectio_reason_code"`
+	RejectionReasonCode string `json:"rejection_reason_code"`
 
 	// Moderator's comment
 	VerificationComment string `json:"verification_comment"`
 
 	// Issue date
-	IssueDate time.Time `json:"issue_data"`
+	IssueDate time.Time `json:"issue_date"`
 
 	// Expire date
 	ExpireDate time.Time `json:"expire_date"`
@@ -331,12 +332,12 @@ type ListCertificatesResultCert struct {
 }
 
 // Certificates list
-func (c Certificates) List(params *ListCertificatesParams) (*ListCertificatesResponse, error) {
+func (c Certificates) List(ctx context.Context, params *ListCertificatesParams) (*ListCertificatesResponse, error) {
 	url := "/v1/product/certificate/list"
 
 	resp := &ListCertificatesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -360,12 +361,12 @@ type ProductStatusesResult struct {
 	Name string `json:"name"`
 }
 
-func (c Certificates) ProductStatuses() (*ProductStatusesResponse, error) {
+func (c Certificates) ProductStatuses(ctx context.Context) (*ProductStatusesResponse, error) {
 	url := "/v1/product/certificate/list"
 
 	resp := &ProductStatusesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -410,12 +411,12 @@ type ListProductsForCertificateResult struct {
 }
 
 // A method for getting a list of possible statuses of products when binding them to a certificate
-func (c Certificates) ListProductsForCertificate(params *ListProductsForCertificateParams) (*ListProductsForCertificateResponse, error) {
+func (c Certificates) ListProductsForCertificate(ctx context.Context, params *ListProductsForCertificateParams) (*ListProductsForCertificateResponse, error) {
 	url := "/v1/product/certificate/products/list"
 
 	resp := &ListProductsForCertificateResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -453,12 +454,12 @@ type UnlinkFromProductResult struct {
 }
 
 // Unbind products from a certificate
-func (c Certificates) UnlinkFromProduct(params *UnlinkFromProductParams) (*UnlinkFromProductResponse, error) {
+func (c Certificates) UnlinkFromProduct(ctx context.Context, params *UnlinkFromProductParams) (*UnlinkFromProductResponse, error) {
 	url := "/v1/product/certificate/unbind"
 
 	resp := &UnlinkFromProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -483,12 +484,12 @@ type PossibleRejectReasonsResult struct {
 }
 
 // Possible certificate rejection reasons
-func (c Certificates) PossibleRejectReasons() (*PossibleRejectReasonsResponse, error) {
+func (c Certificates) PossibleRejectReasons(ctx context.Context) (*PossibleRejectReasonsResponse, error) {
 	url := "/v1/product/certificate/rejection_reasons/list"
 
 	resp := &PossibleRejectReasonsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -512,12 +513,12 @@ type PossibleStatusesResult struct {
 	Name string `json:"name"`
 }
 
-func (c Certificates) PossibleStatuses() (*PossibleStatusesResponse, error) {
+func (c Certificates) PossibleStatuses(ctx context.Context) (*PossibleStatusesResponse, error) {
 	url := "/v1/product/certificate/status/list"
 
 	resp := &PossibleStatusesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -556,12 +557,12 @@ type AddCertificatesForProductsResponse struct {
 }
 
 // Adding certificates for products
-func (c Certificates) AddForProducts(params *AddCertificatesForProductsParams) (*AddCertificatesForProductsResponse, error) {
+func (c Certificates) AddForProducts(ctx context.Context, params *AddCertificatesForProductsParams) (*AddCertificatesForProductsResponse, error) {
 	url := "/v1/product/certificate/create"
 
 	resp := &AddCertificatesForProductsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, map[string]string{
 		"Content-Type": "multipart/form-data",
 	})
 	if err != nil {

ozon/certificates_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 	"time"
@@ -51,11 +52,15 @@ func TestListOfAccordanceTypes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().ListOfAccordanceTypes()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().ListOfAccordanceTypes(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListOfAccordanceTypesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -113,11 +118,15 @@ func TestDirectoryOfDocumentTypes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().DirectoryOfDocumentTypes()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().DirectoryOfDocumentTypes(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DirectoryOfDocumentTypesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -168,11 +177,15 @@ func TestListOfCertifiedCategories(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().ListOfCertifiedCategories(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().ListOfCertifiedCategories(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListOfCertifiedCategoriesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -215,11 +228,15 @@ func TestLinkCertificateToProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().LinkToProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().LinkToProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &LinkCertificateToProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -264,11 +281,15 @@ func TestDeleteCertificate(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().Delete(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().Delete(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DeleteCertificateResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -322,11 +343,15 @@ func TestGetCertificateInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().GetInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().GetInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetCertificateInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -395,11 +420,15 @@ func TestListCertificates(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().List(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().List(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListCertificatesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -441,11 +470,15 @@ func TestProductStatuses(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().ProductStatuses()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().ProductStatuses(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductStatusesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -498,11 +531,15 @@ func TestListProductsForCertificate(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().ListProductsForCertificate(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().ListProductsForCertificate(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListProductsForCertificateResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -551,11 +588,15 @@ func TestUnlinkFromProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().UnlinkFromProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().UnlinkFromProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UnlinkFromProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -597,11 +638,15 @@ func TestPossibleRejectReasons(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().PossibleRejectReasons()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().PossibleRejectReasons(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PossibleRejectReasonsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -643,11 +688,15 @@ func TestPossibleStatuses(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().PossibleStatuses()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().PossibleStatuses(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PossibleStatusesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -695,11 +744,15 @@ func TestAddCertificatesForProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Certificates().AddForProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Certificates().AddForProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AddCertificatesForProductsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/chats.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -81,12 +82,12 @@ type ListChatsChatData struct {
 }
 
 // Returns information about chats by specified filters
-func (c Chats) List(params *ListChatsParams) (*ListChatsResponse, error) {
+func (c Chats) List(ctx context.Context, params *ListChatsParams) (*ListChatsResponse, error) {
 	url := "/v2/chat/list"
 
 	resp := &ListChatsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -111,12 +112,12 @@ type SendMessageResponse struct {
 }
 
 // Sends a message to an existing chat by its identifier
-func (c Chats) SendMessage(params *SendMessageParams) (*SendMessageResponse, error) {
+func (c Chats) SendMessage(ctx context.Context, params *SendMessageParams) (*SendMessageResponse, error) {
 	url := "/v1/chat/send/message"
 
 	resp := &SendMessageResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -144,12 +145,12 @@ type SendFileResponse struct {
 }
 
 // Sends a file to an existing chat by its identifier
-func (c Chats) SendFile(params *SendFileParams) (*SendFileResponse, error) {
+func (c Chats) SendFile(ctx context.Context, params *SendFileParams) (*SendFileResponse, error) {
 	url := "/v1/chat/send/file"
 
 	resp := &SendFileResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -217,12 +218,12 @@ type ChatHistoryMessageUser struct {
 }
 
 // Chat history
-func (c Chats) History(params *ChatHistoryParams) (*ChatHistoryResponse, error) {
+func (c Chats) History(ctx context.Context, params *ChatHistoryParams) (*ChatHistoryResponse, error) {
 	url := "/v2/chat/history"
 
 	resp := &ChatHistoryResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -337,12 +338,12 @@ type UpdateChatResultUser struct {
 }
 
 // Update chat
-func (c Chats) Update(params *UpdateChatParams) (*UpdateChatResponse, error) {
+func (c Chats) Update(ctx context.Context, params *UpdateChatParams) (*UpdateChatResponse, error) {
 	url := "/v1/chat/updates"
 
 	resp := &UpdateChatResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -369,12 +370,12 @@ type CreateNewChatResult struct {
 }
 
 // Creates a new chat on the shipment with the customer. For example, to clarify the address or the product model
-func (c Chats) Create(params *CreateNewChatParams) (*CreateNewChatResponse, error) {
+func (c Chats) Create(ctx context.Context, params *CreateNewChatParams) (*CreateNewChatResponse, error) {
 	url := "/v1/chat/start"
 
 	resp := &CreateNewChatResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -399,12 +400,12 @@ type MarkAsReadResponse struct {
 }
 
 // A method for marking the selected message and messages before it as read
-func (c Chats) MarkAsRead(params *MarkAsReadParams) (*MarkAsReadResponse, error) {
+func (c Chats) MarkAsRead(ctx context.Context, params *MarkAsReadParams) (*MarkAsReadResponse, error) {
 	url := "/v2/chat/read"
 
 	resp := &MarkAsReadResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/chats_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -61,11 +62,15 @@ func TestListChats(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().List(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().List(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListChatsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -119,11 +124,15 @@ func TestSendMessage(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().SendMessage(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().SendMessage(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &SendMessageResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -167,11 +176,15 @@ func TestSendFile(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().SendFile(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().SendFile(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &SendFileResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -230,11 +243,15 @@ func TestChatHistory(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().History(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().History(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ChatHistoryResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -296,11 +313,15 @@ func TestUpdateChat(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().Update(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().Update(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UpdateChatResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -344,11 +365,15 @@ func TestCreateNewChat(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().Create(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().Create(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateNewChatResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -397,11 +422,15 @@ func TestMarkAsRead(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Chats().MarkAsRead(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Chats().MarkAsRead(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &MarkAsReadResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/common.go

@@ -1,5 +1,11 @@
 package ozon
 
+import "time"
+
+const (
+	testTimeout = 5 * time.Second
+)
+
 type Order string
 
 const (
@@ -20,30 +26,24 @@ const (
 type GetAnalyticsDataFilterMetric string
 
 const (
-	UnknownMetric         GetAnalyticsDataFilterMetric = "unknown_metric"
+	UnknownMetric       GetAnalyticsDataFilterMetric = "unknown_metric"
-	HitsViewSearch        GetAnalyticsDataFilterMetric = "hits_view_search"
+	HitsViewSearch      GetAnalyticsDataFilterMetric = "hits_view_search"
-	HistViewPDP           GetAnalyticsDataFilterMetric = "hits_view_pdp"
+	HistViewPDP         GetAnalyticsDataFilterMetric = "hits_view_pdp"
-	HitsView              GetAnalyticsDataFilterMetric = "hist_view"
+	HitsView            GetAnalyticsDataFilterMetric = "hist_view"
-	HitsToCartSearch      GetAnalyticsDataFilterMetric = "hits_tocart_search"
+	HitsToCartSearch    GetAnalyticsDataFilterMetric = "hits_tocart_search"
-	HitsToCartPDP         GetAnalyticsDataFilterMetric = "hits_tocart_pdp"
+	HitsToCartPDP       GetAnalyticsDataFilterMetric = "hits_tocart_pdp"
-	SessionViewSearch     GetAnalyticsDataFilterMetric = "session_view_search"
+	SessionViewSearch   GetAnalyticsDataFilterMetric = "session_view_search"
-	SessionViewPDP        GetAnalyticsDataFilterMetric = "session_view_pdp"
+	SessionViewPDP      GetAnalyticsDataFilterMetric = "session_view_pdp"
-	SessionView           GetAnalyticsDataFilterMetric = "session_view"
+	SessionView         GetAnalyticsDataFilterMetric = "session_view"
-	ConvToCartSearch      GetAnalyticsDataFilterMetric = "conv_tocart_search"
+	ConvToCartSearch    GetAnalyticsDataFilterMetric = "conv_tocart_search"
-	ConvToCartPDP         GetAnalyticsDataFilterMetric = "conv_tocart_pdp"
+	ConvToCartPDP       GetAnalyticsDataFilterMetric = "conv_tocart_pdp"
-	ConvToCart            GetAnalyticsDataFilterMetric = "conv_tocart"
+	ConvToCart          GetAnalyticsDataFilterMetric = "conv_tocart"
-	Revenue               GetAnalyticsDataFilterMetric = "revenue"
+	Revenue             GetAnalyticsDataFilterMetric = "revenue"
-	ReturnsMetric         GetAnalyticsDataFilterMetric = "returns"
+	ReturnsMetric       GetAnalyticsDataFilterMetric = "returns"
-	CancellationsMetric   GetAnalyticsDataFilterMetric = "cancellations"
+	CancellationsMetric GetAnalyticsDataFilterMetric = "cancellations"
-	OrderedUnits          GetAnalyticsDataFilterMetric = "ordered_units"
+	OrderedUnits        GetAnalyticsDataFilterMetric = "ordered_units"
-	DeliveredUnits        GetAnalyticsDataFilterMetric = "delivered_units"
+	DeliveredUnits      GetAnalyticsDataFilterMetric = "delivered_units"
-	AdvViewPDP            GetAnalyticsDataFilterMetric = "adv_view_pdp"
+	PositionCategory    GetAnalyticsDataFilterMetric = "position_category"
-	AdvViewSearchCategory GetAnalyticsDataFilterMetric = "adv_view_search_category"
-	AdvViewAll            GetAnalyticsDataFilterMetric = "adv_view_all"
-	AdvSumAll             GetAnalyticsDataFilterMetric = "adv_sum_all"
-	PositionCategory      GetAnalyticsDataFilterMetric = "position_category"
-	PostingsMetric        GetAnalyticsDataFilterMetric = "postings"
-	PostingsPremium       GetAnalyticsDataFilterMetric = "postings_premium"
 )
 
 type WarehouseType string
@@ -505,3 +505,177 @@ const (
 	// don't change anything. Default value
 	PriceStrategyUnknown PriceStrategy = "UNKNOWN"
 )
+
+type FBPFilter string
+
+const (
+	// all shipments matching other filters will be returned in the response
+	FBPFilterAll FBPFilter = "all"
+
+	// only FBP shipments will be returned
+	FBPFilterOnly FBPFilter = "only"
+
+	// all shipments except FBP will be returned
+	FBPFilterWithout FBPFilter = "without"
+)
+
+type InvoiceCurrency string
+
+const (
+	// dollar
+	InvoiceCurrencyUSD InvoiceCurrency = "USD"
+
+	// euro
+	InvoiceCurrencyEUR InvoiceCurrency = "EUR"
+
+	// Turkish lira
+	InvoiceCurrencyTRY InvoiceCurrency = "TRY"
+
+	// yuan
+	InvoiceCurrencyCNY InvoiceCurrency = "CNY"
+
+	// ruble
+	InvoiceCurrencyRUB InvoiceCurrency = "RUB"
+
+	// pound sterling
+	InvoiceCurrencyGBP InvoiceCurrency = "GBP"
+)
+
+type ReportType string
+
+const (
+	// products report
+	ReportTypeSellerProducts ReportType = "SELLER_PRODUCTS"
+
+	// transactions report
+	ReportTypeSellerTransactions ReportType = "SELLER_TRANSACTIONS"
+
+	// product prices report
+	ReportTypeSellerProductPrices ReportType = "SELLER_PRODUCT_PRICES"
+
+	// stocks report
+	ReportTypeSellerStock ReportType = "SELLER_STOCK"
+
+	// products movement report
+	ReportTypeSellerProductMovement ReportType = "SELLER_PRODUCT_MOVEMENT"
+
+	// returns report
+	ReportTypeSellerReturns ReportType = "SELLER_RETURNS"
+
+	// shipments report
+	ReportTypeSellerPostings ReportType = "SELLER_POSTINGS"
+
+	// financial report
+	ReportTypeSellerFinance ReportType = "SELLER_FINANCE"
+)
+
+type ReportInfoStatus string
+
+const (
+	ReportInfoWaiting    ReportInfoStatus = "waiting"
+	ReportInfoProcessing ReportInfoStatus = "processing"
+	ReportInfoSuccess    ReportInfoStatus = "success"
+	ReportInfoFailed     ReportInfoStatus = "failed"
+)
+
+type SKUAvailability string
+
+const (
+	SKUAvailabilityHidden    = "HIDDEN"
+	SKUAvailabilityAvailable = "AVAILABLE"
+
+	// SKU is deleted
+	SKUAvailabilityUnavailable = "UNAVAILABLE"
+)
+
+type RFBSReturnsGroupState string
+
+const (
+	// All requests
+	RFBSReturnsGroupStateAll RFBSReturnsGroupState = "All"
+
+	// New
+	RFBSReturnsGroupStateNew RFBSReturnsGroupState = "New"
+
+	// Returned product is on the way for check
+	RFBSReturnsGroupStateDelivering RFBSReturnsGroupState = "Delivering"
+
+	// Returned product is being checked
+	RFBSReturnsGroupStateCheckout RFBSReturnsGroupState = "Checkout"
+
+	// Disputed
+	RFBSReturnsGroupStateArbitration RFBSReturnsGroupState = "Arbitration"
+
+	// Approved
+	RFBSReturnsGroupStateApproved RFBSReturnsGroupState = "Approved"
+
+	// Rejected
+	RFBSReturnsGroupStateRejected RFBSReturnsGroupState = "Rejected"
+)
+
+type GetRFBSReturnsCurrency string
+
+const (
+	// Russian ruble
+	GetRFBSReturnsCurrencyRUB GetRFBSReturnsCurrency = "RUB"
+
+	// Belarusian ruble
+	GetRFBSReturnsCurrencyBYN GetRFBSReturnsCurrency = "BYN"
+
+	// Tenge
+	GetRFBSReturnsCurrencyKZT GetRFBSReturnsCurrency = "KZT"
+
+	// Euro
+	GetRFBSReturnsCurrencyEUR GetRFBSReturnsCurrency = "EUR"
+
+	// US dollar
+	GetRFBSReturnsCurrencyUSD GetRFBSReturnsCurrency = "USD"
+
+	// Yuan
+	GetRFBSReturnsCurrencyCNY GetRFBSReturnsCurrency = "CNY"
+)
+
+type GiveoutStatus string
+
+const (
+	// Undefined, contact support team
+	GiveoutStatusUnspecified GiveoutStatus = "GIVEOUT_STATUS_UNSPECIFIED"
+
+	// Created
+	GiveoutStatusCreated GiveoutStatus = "GIVEOUT_STATUS_CREATED"
+
+	// Approved
+	GiveoutStatusApproved GiveoutStatus = "GIVEOUT_STATUS_APPROVED"
+
+	// Completed
+	GiveoutStatusCompleted GiveoutStatus = "GIVEOUT_STATUS_COMPLETED"
+
+	// Cancelled
+	GiveoutStatusCancelled GiveoutStatus = "GIVEOUT_STATUS_CANCELLED"
+)
+
+type GiveoutDeliverySchema string
+
+const (
+	// Undefined, contact support team
+	GiveoutDeliverySchemaUnspecified GiveoutDeliverySchema = "GIVEOUT_DELIVERY_SCHEMA_UNSPECIFIED"
+
+	// FBO
+	GiveoutDeliverySchemaFBO GiveoutDeliverySchema = "GIVEOUT_DELIVERY_SCHEMA_FBO"
+
+	// FBS
+	GiveoutDeliverySchemaFBS GiveoutDeliverySchema = "GIVEOUT_DELIVERY_SCHEMA_FBS"
+)
+
+type MandatoryMarkStatus string
+
+const (
+	// Labeling is processed
+	MandatoryMarkStatusProcessing MandatoryMarkStatus = "processing"
+
+	// Check is passed
+	MandatoryMarkStatusPassed MandatoryMarkStatus = "passed"
+
+	// Check is failed
+	MandatoryMarkStatusFailed MandatoryMarkStatus = "failed"
+)

ozon/fbo.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -165,12 +166,12 @@ type FBOFinancialData struct {
 }
 
 // Returns a list of shipments for a specified period of time. You can additionally filter the shipments by their status
-func (c FBO) GetShipmentsList(params *GetFBOShipmentsListParams) (*GetFBOShipmentsListResponse, error) {
+func (c FBO) GetShipmentsList(ctx context.Context, params *GetFBOShipmentsListParams) (*GetFBOShipmentsListResponse, error) {
 	url := "/v2/posting/fbo/list"
 
 	resp := &GetFBOShipmentsListResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -247,7 +248,7 @@ type GetShipmentDetailsResultAdditionalData struct {
 
 type GetShipmentDetailsResultAnalyticsData struct {
 	// Delivery city
-	City string `json:"Delivery city"`
+	City string `json:"city"`
 
 	// Delivery method
 	DeliveryType string `json:"delivery_type"`
@@ -274,12 +275,12 @@ type GetShipmentDetailsResultAnalyticsData struct {
 }
 
 // Returns information about the shipment by its identifier
-func (c FBO) GetShipmentDetails(params *GetShipmentDetailsParams) (*GetShipmentDetailsResponse, error) {
+func (c FBO) GetShipmentDetails(ctx context.Context, params *GetShipmentDetailsParams) (*GetShipmentDetailsResponse, error) {
 	url := "/v2/posting/fbo/get"
 
 	resp := &GetShipmentDetailsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -322,10 +323,14 @@ type SupplyRequestCommonResponse struct {
 	LocalTimeslot SupplyRequestCommonResponseLocalTimeslot `json:"local_timeslot"`
 
 	// Date from which you want to bring the supply to the warehouse. Only for supplies via vDC
-	PreferredSupplyDataFrom string `json:"preferred_supply_data_from"`
+	PreferredSupplyDateFrom string `json:"preferred_supply_date_from"`
 
 	// Date by which you want to bring the supply to the warehouse. Only for supplies via vDC
-	PreferredSupplyDataTo string `json:"preferred_supply_data_to"`
+	PreferredSupplyDateTo string `json:"preferred_supply_date_to"`
+
+	// Your own warehouse from which you'll take the products to the supply warehouse.
+	// Only for supplies via vDC
+	SellerWarehouse SupplyRequestSellerWarehouse `json:"seller_warehouse"`
 
 	// Status of a supply by request
 	State string `json:"state"`
@@ -352,6 +357,17 @@ type SupplyRequestCommonResponse struct {
 	TotalQuantity int32 `json:"total_quantity"`
 }
 
+type SupplyRequestSellerWarehouse struct {
+	// Warehouse address
+	Address string `json:"address"`
+
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
 type SupplyRequestCommonResponseLocalTimeslot struct {
 	// Interval start
 	From string `json:"from"`
@@ -374,12 +390,12 @@ type SupplyRequestCommonResponseSupplyWarehouse struct {
 // Method for getting a list of supply requests to the Ozon warehouse.
 // Requests with supply both to a specific warehouse and via a virtual
 // distribution center (vDC) are taken into account
-func (c FBO) ListSupplyRequests(params *ListSupplyRequestsParams) (*ListSupplyRequestsResponse, error) {
+func (c FBO) ListSupplyRequests(ctx context.Context, params *ListSupplyRequestsParams) (*ListSupplyRequestsResponse, error) {
 	url := "/v1/supply-order/list"
 
 	resp := &ListSupplyRequestsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -419,12 +435,12 @@ type GetSupplyRequestInfoVehicle struct {
 // Method for getting detailed information on a supply request.
 // Requests with supply both to a specific warehouse and via a
 // virtual distribution center (vDC) are taken into account
-func (c FBO) GetSupplyRequestInfo(params *GetSupplyRequestInfoParams) (*GetSupplyRequestInfoResponse, error) {
+func (c FBO) GetSupplyRequestInfo(ctx context.Context, params *GetSupplyRequestInfoParams) (*GetSupplyRequestInfoResponse, error) {
 	url := "/v1/supply-order/get"
 
 	resp := &GetSupplyRequestInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -477,12 +493,12 @@ type ListProductsInSupplyRequestItem struct {
 }
 
 // List of products in the sullpy request
-func (c FBO) ListProductsInSupplyRequest(params *ListProductsInSupplyRequestParams) (*ListProductsInSupplyRequestResponse, error) {
+func (c FBO) ListProductsInSupplyRequest(ctx context.Context, params *ListProductsInSupplyRequestParams) (*ListProductsInSupplyRequestResponse, error) {
 	url := "/v1/supply-order/items"
 
 	resp := &ListProductsInSupplyRequestResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -534,12 +550,12 @@ type GetWarehouseWorkloadResultWarehouse struct {
 }
 
 // Method returns a list of active Ozon warehouses with information about their average workload in the nearest future
-func (c FBO) GetWarehouseWorkload() (*GetWarehouseWorkloadResponse, error) {
+func (c FBO) GetWarehouseWorkload(ctx context.Context) (*GetWarehouseWorkloadResponse, error) {
 	url := "/v1/supplier/available_warehouses"
 
 	resp := &GetWarehouseWorkloadResponse{}
 
-	response, err := c.client.Request(http.MethodGet, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/fbo_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -43,8 +44,8 @@ func TestGetFBOShipmentsList(t *testing.T) {
 					"posting_number": "16965409-0014-1",
 					"status": "delivered",
 					"cancel_reason_id": 0,
-					"created_at": "2021-09-01T00:23:45.607000Z",
+					"created_at": "2021-09-01T00:23:45.607Z",
-					"in_process_at": "2021-09-01T00:25:30.120000Z",
+					"in_process_at": "2021-09-01T00:25:30.12Z",
 					"products": [
 					  {
 						"sku": 160249683,
@@ -133,11 +134,15 @@ func TestGetFBOShipmentsList(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().GetShipmentsList(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().GetShipmentsList(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFBOShipmentsListResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -261,11 +266,15 @@ func TestGetShipmentDetails(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().GetShipmentDetails(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().GetShipmentDetails(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetShipmentDetailsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -339,11 +348,15 @@ func TestListSupplyRequests(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().ListSupplyRequests(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().ListSupplyRequests(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListSupplyRequestsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -414,11 +427,15 @@ func TestGetSupplyRequestInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().GetSupplyRequestInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().GetSupplyRequestInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetSupplyRequestInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -472,11 +489,15 @@ func TestListProductsInSupplyRequest(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().ListProductsInSupplyRequest(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().ListProductsInSupplyRequest(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListProductsInSupplyRequestResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -530,11 +551,15 @@ func TestGetWarehouseWorkload(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBO().GetWarehouseWorkload()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBO().GetWarehouseWorkload(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetWarehouseWorkloadResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/fbs.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -52,6 +53,13 @@ type ListUnprocessedShipmentsFilter struct {
 	// Delivery method identifier
 	DeliveryMethodId []int64 `json:"delivery_method_id"`
 
+	// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
+	//
+	// Default value is all.
+	//
+	// The FBP scheme is available only for sellers from China
+	FBPFilter FBPFilter `json:"fbpFilter"`
+
 	// Delivery service identifier
 	ProviderId []int64 `json:"provider_id"`
 
@@ -298,7 +306,7 @@ type FBSRequirements struct {
 	//
 	// To pack the shipment, pass the CCD number for all listed SKUs.
 	// If you do not have a CCD number, pass the value `is_gtd_absent` = true
-	// via the `/v3/posting/fbs/ship/package` or `/v3/posting/fbs/ship` method
+	// via the `/v3/posting/fbs/ship/package`
 	ProductsRequiringGTD []string `json:"products_requiring_gtd"`
 
 	// Array of Ozon Product IDs (SKU) for which
@@ -400,7 +408,7 @@ type MarketplaceServices struct {
 	DirectFlowTrans float64 `json:"marketplace_service_item_direct_flow_trans"`
 
 	// Shipment processing in the fulfilment warehouse (FF)
-	DropoffFF float64 `json:"marketplace_service_item_item_dropoff_ff"`
+	DropoffFF float64 `json:"marketplace_service_item_dropoff_ff"`
 
 	// Shipment processing at the pick up point
 	DropoffPVZ float64 `json:"marketplace_service_item_dropoff_pvz"`
@@ -487,12 +495,12 @@ type FinancialDataProductPicking struct {
 	Tag string `json:"tag"`
 }
 
-func (c FBS) ListUnprocessedShipments(params *ListUnprocessedShipmentsParams) (*ListUnprocessedShipmentsResponse, error) {
+func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocessedShipmentsParams) (*ListUnprocessedShipmentsResponse, error) {
 	url := "/v3/posting/fbs/unfulfilled/list"
 
 	resp := &ListUnprocessedShipmentsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -524,6 +532,13 @@ type GetFBSShipmentsListFilter struct {
 	// Delivery method identifier
 	DeliveryMethodId []int64 `json:"delivery_method_id"`
 
+	// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
+	//
+	// Default value is all.
+	//
+	// The FBP scheme is available only for sellers from China
+	FBPFilter FBPFilter `json:"fbpFilter"`
+
 	// Order identifier
 	OrderId int64 `json:"order_id"`
 
@@ -588,12 +603,12 @@ type GetFBSShipmentsListResult struct {
 // You can filter shipments by their status. The list of available statuses is specified in the description of the filter.status parameter.
 //
 // The true value of the has_next parameter in the response means there is not the entire array of shipments in the response. To get information on the remaining shipments, make a new request with a different offset value.
-func (c FBS) GetFBSShipmentsList(params *GetFBSShipmentsListParams) (*GetFBSShipmentsListResponse, error) {
+func (c FBS) GetFBSShipmentsList(ctx context.Context, params *GetFBSShipmentsListParams) (*GetFBSShipmentsListResponse, error) {
 	url := "/v3/posting/fbs/list"
 
 	resp := &GetFBSShipmentsListResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -659,12 +674,12 @@ type PackOrderAdditionalData struct {
 // Differs from /v2/posting/fbs/ship by the presence of the field `exemplar_info` in the request.
 //
 // If necessary, specify the number of the cargo customs declaration in the gtd parameter. If it is missing, pass the value is_gtd_absent = true
-func (c FBS) PackOrder(params *PackOrderParams) (*PackOrderResponse, error) {
+func (c FBS) PackOrder(ctx context.Context, params *PackOrderParams) (*PackOrderResponse, error) {
 	url := "/v4/posting/fbs/ship"
 
 	resp := &PackOrderResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -729,12 +744,12 @@ type ValidateLabelingCodesResultProduct struct {
 // Method for checking whether labeling codes meet the "Chestny ZNAK" system requirements on length and symbols.
 //
 // If you don't have the customs cargo declaration (CCD) number, you don't have to specify it
-func (c FBS) ValidateLabelingCodes(params *ValidateLabelingCodesParams) (*ValidateLabelingCodesResponse, error) {
+func (c FBS) ValidateLabelingCodes(ctx context.Context, params *ValidateLabelingCodesParams) (*ValidateLabelingCodesResponse, error) {
 	url := "/v4/fbs/posting/product/exemplar/validate"
 
 	resp := &ValidateLabelingCodesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -831,12 +846,12 @@ type GetShipmentDataByBarcodeResultFinancialData struct {
 }
 
 // Method for getting shipments data by barcode
-func (c FBS) GetShipmentDataByBarcode(params *GetShipmentDataByBarcodeParams) (*GetShipmentDataByBarcodeResponse, error) {
+func (c FBS) GetShipmentDataByBarcode(ctx context.Context, params *GetShipmentDataByBarcodeParams) (*GetShipmentDataByBarcodeResponse, error) {
 	url := "/v2/posting/fbs/get-by-barcode"
 
 	resp := &GetShipmentDataByBarcodeResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -895,7 +910,7 @@ type GetShipmentDataByIdentifierResult struct {
 	Barcodes FBSBarcode `json:"barcodes"`
 
 	// Cancellation details
-	Cancellation FBSCancellation `json:"calcellation"`
+	Cancellation FBSCancellation `json:"cancellation"`
 
 	// Courier information
 	Courier GetShipmentDataByIdentifierResultCourier `json:"courier"`
@@ -910,10 +925,10 @@ type GetShipmentDataByIdentifierResult struct {
 	DeliveryMethod FBSDeliveryMethod `json:"delivery_method"`
 
 	// Delivery cost
-	DeliveryPrice string `json:"delivery_type"`
+	DeliveryPrice string `json:"delivery_price"`
 
 	// Data on the product cost, discount amount, payout and commission
-	FinancialData FBSFinancialData `json:"financial_date"`
+	FinancialData FBSFinancialData `json:"financial_data"`
 
 	// Start date and time of shipment processing
 	InProcessAt time.Time `json:"in_process_at"`
@@ -1103,29 +1118,48 @@ type ProductDimension struct {
 }
 
 type FBSProductExemplar struct {
+	// Product item validation errors
+	Errors []string `json:"errors"`
+
 	// Mandatory “Chestny ZNAK” labeling
 	MandatoryMark string `json:"mandatory_mark"`
 
+	// "Chestny ZNAK" labeling check status
+	MandatoryMarkCheckStatus MandatoryMarkStatus `json:"mandatory_mark_check_status"`
+
+	// "Chestny ZNAK" labeling check error codes
+	MandatoryMarkErrorCodes []string `json:"mandatory_mark_error_codes"`
+
 	// Сustoms cargo declaration (CCD) number
 	GTD string `json:"gtd"`
 
+	// Сustoms cargo declaration (CCD) check status
+	GTDCheckStatus string `json:"gtd_check_status"`
+
 	// Indication that a сustoms cargo declaration (CCD) number hasn't been specified
 	IsGTDAbsest bool `json:"is_gtd_absent"`
 
+	// Сustoms cargo declaration (CCD) check error codes
+	GTDErrorCodes []string `json:"gtd_error_codes"`
+
 	// Product batch registration number
 	RNPT string `json:"rnpt"`
 
 	// Indication that a product batch registration number hasn't been specified
 	IsRNPTAbsent bool `json:"is_rnpt_absent"`
+
+	// Check result.
+	// `true` if the labeling code of product item meets the requirements
+	Valid bool `json:"valid"`
 }
 
 // Method for getting shipment details by identifier
-func (c FBS) GetShipmentDataByIdentifier(params *GetShipmentDataByIdentifierParams) (*GetShipmentDataByIdentifierResponse, error) {
+func (c FBS) GetShipmentDataByIdentifier(ctx context.Context, params *GetShipmentDataByIdentifierParams) (*GetShipmentDataByIdentifierResponse, error) {
 	url := "/v3/posting/fbs/get"
 
 	resp := &GetShipmentDataByIdentifierResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1166,12 +1200,12 @@ type AddTrackingNumbersResponseResult struct {
 }
 
 // Add tracking numbers to shipments
-func (c FBS) AddTrackingNumbers(params *AddTrackingNumbersParams) (*AddTrackingNumbersResponse, error) {
+func (c FBS) AddTrackingNumbers(ctx context.Context, params *AddTrackingNumbersParams) (*AddTrackingNumbersResponse, error) {
 	url := "/v2/fbs/posting/tracking-number/set"
 
 	resp := &AddTrackingNumbersResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1229,7 +1263,7 @@ type ListOfShipmentCertificatesResult struct {
 	IntegrationType string `json:"integration_type"`
 
 	// Number of package units
-	ContainersCount int32 `json:"container_count"`
+	ContainersCount int32 `json:"containers_count"`
 
 	// Shipping status
 	Status string `json:"status"`
@@ -1290,12 +1324,12 @@ type FBSAct struct {
 }
 
 // Returns a list of shipment certificates allowing to filter them by time period, status, and integration type
-func (c FBS) ListOfShipmentCertificates(params *ListOfShipmentCertificatesParams) (*ListOfShipmentCertificatesResponse, error) {
+func (c FBS) ListOfShipmentCertificates(ctx context.Context, params *ListOfShipmentCertificatesParams) (*ListOfShipmentCertificatesResponse, error) {
 	url := "/v2/posting/fbs/act/list"
 
 	resp := &ListOfShipmentCertificatesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1322,12 +1356,12 @@ type SignShipmentCertificateResponse struct {
 }
 
 // Signs shipment certificates electronically via the electronic documents (ED) system of Ozon logistics
-func (c FBS) SignShipmentCertificate(params *SignShipmentCertificateParams) (*SignShipmentCertificateResponse, error) {
+func (c FBS) SignShipmentCertificate(ctx context.Context, params *SignShipmentCertificateParams) (*SignShipmentCertificateResponse, error) {
 	url := "/v2/posting/fbs/digital/act/document-sign"
 
 	resp := &SignShipmentCertificateResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1360,12 +1394,12 @@ type ChangeStatusToResponseResult struct {
 }
 
 // Changes the shipment status to "Delivering" if a third-party delivery service is being used
-func (c FBS) ChangeStatusToDelivering(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
+func (c FBS) ChangeStatusToDelivering(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
 	url := "/v2/fbs/posting/delivering"
 
 	resp := &ChangeStatusToResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1375,12 +1409,12 @@ func (c FBS) ChangeStatusToDelivering(params *ChangeStatusToParams) (*ChangeStat
 }
 
 // Changes the shipment status to "Last mile" if a third-party delivery service is being used
-func (c FBS) ChangeStatusToLastMile(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
+func (c FBS) ChangeStatusToLastMile(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
 	url := "/v2/fbs/posting/last-mile"
 
 	resp := &ChangeStatusToResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1390,12 +1424,12 @@ func (c FBS) ChangeStatusToLastMile(params *ChangeStatusToParams) (*ChangeStatus
 }
 
 // Changes the shipment status to "Delivered" if a third-party delivery service is being used
-func (c FBS) ChangeStatusToDelivered(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
+func (c FBS) ChangeStatusToDelivered(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
 	url := "/v2/fbs/posting/delivered"
 
 	resp := &ChangeStatusToResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1405,12 +1439,12 @@ func (c FBS) ChangeStatusToDelivered(params *ChangeStatusToParams) (*ChangeStatu
 }
 
 // Change shipment status to "Sent by seller". Status is only available to sellers with a first mile selling from abroad
-func (c FBS) ChangeStatusToSendBySeller(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
+func (c FBS) ChangeStatusToSendBySeller(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
 	url := "/v2/fbs/posting/sent-by-seller"
 
 	resp := &ChangeStatusToResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1432,12 +1466,12 @@ type PassShipmentToShippingResponse struct {
 }
 
 // Transfers disputed orders to shipping. The shipment status will change to `awaiting_deliver`
-func (c FBS) PassShipmentToShipping(params *PassShipmentToShippingParams) (*PassShipmentToShippingResponse, error) {
+func (c FBS) PassShipmentToShipping(ctx context.Context, params *PassShipmentToShippingParams) (*PassShipmentToShippingResponse, error) {
 	url := "/v2/posting/fbs/awaiting-delivery"
 
 	resp := &PassShipmentToShippingResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1480,12 +1514,12 @@ type CancelShipmentResponse struct {
 // You can't cancel presumably delivered orders.
 //
 // If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field.
-func (c FBS) CancelShipment(params *CancelShipmentParams) (*CancelShipmentResponse, error) {
+func (c FBS) CancelShipment(ctx context.Context, params *CancelShipmentParams) (*CancelShipmentResponse, error) {
 	url := "/v2/posting/fbs/cancel"
 
 	resp := &CancelShipmentResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1527,12 +1561,12 @@ type CreateActResult struct {
 // Launches the procedure for generating the transfer documents: acceptance and transfer certificate and the waybill.
 //
 // To generate and receive transfer documents, transfer the shipment to the `awaiting_deliver` status
-func (c FBS) CreateAct(params *CreateActParams) (*CreateActResponse, error) {
+func (c FBS) CreateAct(ctx context.Context, params *CreateActParams) (*CreateActResponse, error) {
 	url := "/v2/posting/fbs/act/create"
 
 	resp := &CreateActResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1569,12 +1603,12 @@ type GetLabelingResult struct {
 }
 
 // Method for getting labeling after using the /v1/posting/fbs/package-label/create method
-func (c FBS) GetLabeling(params *GetLabelingParams) (*GetLabelingResponse, error) {
+func (c FBS) GetLabeling(ctx context.Context, params *GetLabelingParams) (*GetLabelingResponse, error) {
 	url := "/v1/posting/fbs/package-label/get"
 
 	resp := &GetLabelingResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/pdf",
 	})
 	if err != nil {
@@ -1609,12 +1643,12 @@ type PrintLabelingResponse struct {
 // We recommend requesting the label 45-60 seconds after the shipments were packed.
 //
 // The next postings are not ready error means that the label is not ready. Try again later
-func (c FBS) PrintLabeling(params *PrintLabelingParams) (*PrintLabelingResponse, error) {
+func (c FBS) PrintLabeling(ctx context.Context, params *PrintLabelingParams) (*PrintLabelingResponse, error) {
 	url := "/v2/posting/fbs/package-label"
 
 	resp := &PrintLabelingResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/pdf",
 	})
 	if err != nil {
@@ -1645,12 +1679,12 @@ type CreateTaskForGeneratingLabelResult struct {
 // Method for creating a task for asynchronous labeling generation.
 //
 // To get labels created as a result of the method, use the /v1/posting/fbs/package-label/get method
-func (c FBS) CreateTaskForGeneratingLabel(params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
+func (c FBS) CreateTaskForGeneratingLabel(ctx context.Context, params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
 	url := "/v1/posting/fbs/package-label/create"
 
 	resp := &CreateTaskForGeneratingLabelResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/pdf",
 	})
 	if err != nil {
@@ -1701,12 +1735,12 @@ type GetDropOffPointRestrictionsResult struct {
 
 // Method for getting dimensions, weight, and other restrictions of the drop-off point by the shipment number.
 // The method is applicable only for the FBS scheme
-func (c FBS) GetDropOffPointRestrictions(params *GetDropOffPointRestrictionsParams) (*GetDropOffPointRestrictionsResponse, error) {
+func (c FBS) GetDropOffPointRestrictions(ctx context.Context, params *GetDropOffPointRestrictionsParams) (*GetDropOffPointRestrictionsResponse, error) {
 	url := "/v1/posting/fbs/restrictions"
 
 	resp := &GetDropOffPointRestrictionsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1752,12 +1786,12 @@ type CheckProductItemsDataResponse struct {
 // For example, you have 10 product items in your system.
 // You have passed them for checking and saving. Then they added another 60 product items to your system.
 // When you pass product items for checking and saving again, pass all of them: both old and newly added
-func (c FBS) CheckproductItemsData(params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
+func (c FBS) CheckProductItemsData(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
 	url := "/v4/fbs/posting/product/exemplar/set"
 
 	resp := &CheckProductItemsDataResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1789,12 +1823,12 @@ type GetProductItemsCheckStatusesResponse struct {
 
 // Method for getting check statuses of product items that were passed in the `/fbs/posting/product/exemplar/set` method.
 // Also returns data on these product items.
-func (c FBS) GetProductItemsCheckStatuses(params *GetProductItemsCheckStatusesParams) (*GetProductItemsCheckStatusesResponse, error) {
+func (c FBS) GetProductItemsCheckStatuses(ctx context.Context, params *GetProductItemsCheckStatusesParams) (*GetProductItemsCheckStatusesResponse, error) {
 	url := "/v4/fbs/posting/product/exemplar/status"
 
 	resp := &GetProductItemsCheckStatusesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1827,12 +1861,12 @@ type RescheduleShipmentDeliveryDateResponse struct {
 }
 
 // You can change the delivery date of a shipment up to two times
-func (c FBS) RescheduleShipmentDeliveryDate(params *RescheduleShipmentDeliveryDateParams) (*RescheduleShipmentDeliveryDateResponse, error) {
+func (c FBS) RescheduleShipmentDeliveryDate(ctx context.Context, params *RescheduleShipmentDeliveryDateParams) (*RescheduleShipmentDeliveryDateResponse, error) {
 	url := "/v1/posting/fbs/timeslot/set"
 
 	resp := &RescheduleShipmentDeliveryDateResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1868,12 +1902,12 @@ type DateAvailableForDeliveryScheduleDeliveryInterval struct {
 }
 
 // Method for getting the dates and number of times available for delivery reschedule
-func (c FBS) DateAvailableForDeliverySchedule(params *DateAvailableForDeliveryScheduleParams) (*DateAvailableForDeliveryScheduleResponse, error) {
+func (c FBS) DateAvailableForDeliverySchedule(ctx context.Context, params *DateAvailableForDeliveryScheduleParams) (*DateAvailableForDeliveryScheduleResponse, error) {
 	url := "/v1/posting/fbs/timeslot/change-restrictions"
 
 	resp := &DateAvailableForDeliveryScheduleResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1903,12 +1937,12 @@ type ListManufacturingCountriesResult struct {
 }
 
 // Method for getting a list of available manufacturing countries and their ISO codes
-func (c FBS) ListManufacturingCountries(params *ListManufacturingCountriesParams) (*ListManufacturingCountriesResponse, error) {
+func (c FBS) ListManufacturingCountries(ctx context.Context, params *ListManufacturingCountriesParams) (*ListManufacturingCountriesResponse, error) {
 	url := "/v2/posting/fbs/product/country/list"
 
 	resp := &ListManufacturingCountriesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1939,12 +1973,12 @@ type SetManufacturingCountryResponse struct {
 }
 
 // The method to set the manufacturing country to the product if it hasn't been specified
-func (c FBS) SetManufacturingCountry(params *SetManufacturingCountryParams) (*SetManufacturingCountryResponse, error) {
+func (c FBS) SetManufacturingCountry(ctx context.Context, params *SetManufacturingCountryParams) (*SetManufacturingCountryResponse, error) {
 	url := "/v2/posting/fbs/product/country/set"
 
 	resp := &SetManufacturingCountryResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1994,12 +2028,12 @@ type PartialPackOrderAdditionalData struct {
 // The primary unassembled shipment will contain some of the products that were not passed to the request.
 //
 // The status of the original shipment will only change when the split shipments status changes
-func (c FBS) PartialPackOrder(params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
+func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
 	url := "/v3/posting/fbs/ship/package"
 
 	resp := &PartialPackOrderResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2087,12 +2121,12 @@ type AvailableFreightsListResultError struct {
 }
 
 // Method for getting freights that require printing acceptance and transfer certificates and a waybill
-func (c FBS) AvailableFreightsList(params *AvailableFreightsListParams) (*AvailableFreightsListResponse, error) {
+func (c FBS) AvailableFreightsList(ctx context.Context, params *AvailableFreightsListParams) (*AvailableFreightsListResponse, error) {
 	url := "/v1/posting/carriage-available/list"
 
 	resp := &AvailableFreightsListResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2123,12 +2157,12 @@ type GenerateActResponse struct {
 }
 
 // Get current status of generating digital acceptance and transfer certificate and waybill
-func (c FBS) GenerateAct(params *GenerateActParams) (*GenerateActResponse, error) {
+func (c FBS) GenerateAct(ctx context.Context, params *GenerateActParams) (*GenerateActResponse, error) {
 	url := "/v2/posting/fbs/digital/act/check-status"
 
 	resp := &GenerateActResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2162,12 +2196,12 @@ type GetDigitalActResponse struct {
 }
 
 // Specify the type of a certificate in the doc_type parameter: `act_of_acceptance`, `act_of_mismatch`, `act_of_excess`
-func (c FBS) GetDigitalAct(params *GetDigitalActParams) (*GetDigitalActResponse, error) {
+func (c FBS) GetDigitalAct(ctx context.Context, params *GetDigitalActParams) (*GetDigitalActResponse, error) {
 	url := "/v2/posting/fbs/digital/act/get-pdf"
 
 	resp := &GetDigitalActResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/json",
 	})
 	if err != nil {
@@ -2197,12 +2231,12 @@ type PackageUnitLabelsResponse struct {
 }
 
 // Method creates package unit labels
-func (c FBS) PackageUnitLabel(params *PackageUnitLabelsParams) (*PackageUnitLabelsResponse, error) {
+func (c FBS) PackageUnitLabel(ctx context.Context, params *PackageUnitLabelsParams) (*PackageUnitLabelsResponse, error) {
 	url := "/v2/posting/fbs/act/get-container-labels"
 
 	resp := &PackageUnitLabelsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/json",
 	})
 	if err != nil {
@@ -2227,12 +2261,12 @@ type OpenDisputeOverShipmentResponse struct {
 
 // If the shipment has been handed over for delivery, but has not been scanned at the sorting center, you can open a dispute.
 // Opened dispute will put the shipment into the `arbitration` status
-func (c FBS) OpenDisputeOverShipment(params *OpenDisputeOverShipmentParams) (*OpenDisputeOverShipmentResponse, error) {
+func (c FBS) OpenDisputeOverShipment(ctx context.Context, params *OpenDisputeOverShipmentParams) (*OpenDisputeOverShipmentResponse, error) {
 	url := "/v2/posting/fbs/arbitration"
 
 	resp := &OpenDisputeOverShipmentResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2273,12 +2307,12 @@ type ShipmentCancellationReasonsResultReason struct {
 }
 
 // Returns a list of cancellation reasons for particular shipments
-func (c FBS) ShipmentCancellationReasons(params *ShipmentCancellationReasonsParams) (*ShipmentCancellationReasonsResponse, error) {
+func (c FBS) ShipmentCancellationReasons(ctx context.Context, params *ShipmentCancellationReasonsParams) (*ShipmentCancellationReasonsResponse, error) {
 	url := "/v1/posting/fbs/cancel-reason"
 
 	resp := &ShipmentCancellationReasonsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2311,12 +2345,12 @@ type ShipmentsCancellatinoReasonsResult struct {
 }
 
 // Returns a list of cancellation reasons for particular shipments
-func (c FBS) ShipmentsCancellationReasons() (*ShipmentsCancellationReasonsResponse, error) {
+func (c FBS) ShipmentsCancellationReasons(ctx context.Context) (*ShipmentsCancellationReasonsResponse, error) {
 	url := "/v2/posting/fbs/cancel-reason/list"
 
 	resp := &ShipmentsCancellationReasonsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2349,12 +2383,12 @@ type AddWeightForBulkProductResponse struct {
 }
 
 // Add weight for bulk products in a shipment
-func (c FBS) AddWeightForBulkProduct(params *AddWeightForBulkProductParams) (*AddWeightForBulkProductResponse, error) {
+func (c FBS) AddWeightForBulkProduct(ctx context.Context, params *AddWeightForBulkProductParams) (*AddWeightForBulkProductResponse, error) {
 	url := "/v2/posting/fbs/product/change"
 
 	resp := &AddWeightForBulkProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2408,12 +2442,12 @@ type CancelSendingResponse struct {
 // You can't cancel presumably delivered orders.
 //
 // If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field.
-func (c FBS) CancelSending(params *CancelSendingParams) (*CancelSendingResponse, error) {
+func (c FBS) CancelSending(ctx context.Context, params *CancelSendingParams) (*CancelSendingResponse, error) {
 	url := "/v2/posting/fbs/product/cancel"
 
 	resp := &CancelSendingResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2451,7 +2485,7 @@ type ListShipmentInCertificateResult struct {
 	SellerError string `json:"seller_error"`
 
 	// Shipment record update date and time
-	UpdatedAt time.Time `json:"update_at"`
+	UpdatedAt time.Time `json:"updated_at"`
 
 	// Shipment record creation date and time
 	CreatedAt time.Time `json:"created_at"`
@@ -2478,12 +2512,12 @@ type ListShipmentInCertificateResultProduct struct {
 }
 
 // Returns a list of shipments in the certificate by certificate identifier
-func (c FBS) ListShipmentInCertificate(params *ListShipmentInCertificateParams) (*ListShipmentInCertificateResponse, error) {
+func (c FBS) ListShipmentInCertificate(ctx context.Context, params *ListShipmentInCertificateParams) (*ListShipmentInCertificateResponse, error) {
 	url := "/v2/posting/fbs/act/get-postings"
 
 	resp := &ListShipmentInCertificateResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2515,12 +2549,12 @@ type SpecifyNumberOfBoxesResult struct {
 }
 
 // Method for passing the number of boxes for multi-box shipments when working under the rFBS Aggregator scheme (using the Ozon partner delivery)
-func (c FBS) SpecifyNumberOfBoxes(params *SpecifyNumberOfBoxesParams) (*SpecifyNumberOfBoxesResponse, error) {
+func (c FBS) SpecifyNumberOfBoxes(ctx context.Context, params *SpecifyNumberOfBoxesParams) (*SpecifyNumberOfBoxesResponse, error) {
 	url := "/v3/posting/multiboxqty/set"
 
 	resp := &SpecifyNumberOfBoxesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2586,12 +2620,12 @@ type StatusOfActResponseResult struct {
 // the method returns status of generating an acceptance and transfer certificate and a waybill.
 //
 // If you are connected to EDC, the method returns status of generating a waybill only
-func (c FBS) StatusOfAct(params *StatusOfActParams) (*StatusOfActResponse, error) {
+func (c FBS) StatusOfAct(ctx context.Context, params *StatusOfActParams) (*StatusOfActResponse, error) {
 	url := "/v2/posting/fbs/act/check-status"
 
 	resp := &StatusOfActResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2642,12 +2676,12 @@ type ETGBCustomDeclarationsResultETGB struct {
 }
 
 // Method for getting Elektronik Ticaret Gümrük Beyannamesi (ETGB) customs declarations for sellers from Turkey
-func (c FBS) ETGBCustomsDeclarations(params *ETGBCustomsDeclarationsParams) (*ETGBCustomsDeclarationsResponse, error) {
+func (c FBS) ETGBCustomsDeclarations(ctx context.Context, params *ETGBCustomsDeclarationsParams) (*ETGBCustomsDeclarationsResponse, error) {
 	url := "/v1/posting/global/etgb"
 
 	resp := &ETGBCustomsDeclarationsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2675,12 +2709,12 @@ type BarcodeFromProductShipmentResponse struct {
 }
 
 // Method for getting a barcode to show at a pick-up point or sorting center during the shipment
-func (c FBS) BarcodeFromProductShipment(params *BarcodeFromProductShipmentParams) (*BarcodeFromProductShipmentResponse, error) {
+func (c FBS) BarcodeFromProductShipment(ctx context.Context, params *BarcodeFromProductShipmentParams) (*BarcodeFromProductShipmentResponse, error) {
 	url := "/v2/posting/fbs/act/get-barcode"
 
 	resp := &BarcodeFromProductShipmentResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "image/png",
 	})
 	if err != nil {
@@ -2704,12 +2738,12 @@ type BarcodeValueFromProductShipmentResponse struct {
 }
 
 // Use this method to get the barcode from the /v2/posting/fbs/act/get-barcode response in text format.
-func (c FBS) BarcodeValueFromProductShipment(params *BarcodeValueFromProductShipmentParams) (*BarcodeValueFromProductShipmentResponse, error) {
+func (c FBS) BarcodeValueFromProductShipment(ctx context.Context, params *BarcodeValueFromProductShipmentParams) (*BarcodeValueFromProductShipmentResponse, error) {
 	url := "/v2/posting/fbs/act/get-barcode/text"
 
 	resp := &BarcodeValueFromProductShipmentResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2742,12 +2776,12 @@ type GetActPDFResponse struct {
 // If you are not connected to electronic document circulation (EDC), the method returns an acceptance and transfer certificate and a waybill.
 //
 // If you are connected to EDC, the method returns a waybill only.
-func (c FBS) GetActPDF(params *GetActPDFParams) (*GetActPDFResponse, error) {
+func (c FBS) GetActPDF(ctx context.Context, params *GetActPDFParams) (*GetActPDFResponse, error) {
 	url := "/v2/posting/fbs/act/get-pdf"
 
 	resp := &GetActPDFResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
 		"Content-Type": "application/pdf",
 	})
 	if err != nil {

ozon/fbs_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -167,11 +168,15 @@ func TestListUnprocessedShipments(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ListUnprocessedShipments(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ListUnprocessedShipments(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListUnprocessedShipmentsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -194,16 +199,22 @@ func TestGetFBSShipmentsList(t *testing.T) {
 			&GetFBSShipmentsListParams{
 				Direction: "ASC",
 				Filter: GetFBSShipmentsListFilter{
-					Since:  core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-01T00:00:00.000Z"),
+					Since:            core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-01T00:00:00.000Z"),
-					To:     core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-12-01T23:59:59.000Z"),
+					To:               core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-12-01T23:59:59.000Z"),
-					Status: "awaiting_packaging",
+					Status:           "awaiting_packaging",
+					WarehouseId:      []int64{123},
+					ProviderId:       []int64{223},
+					FBPFilter:        FBPFilterAll,
+					DeliveryMethodId: []int64{456},
+					OrderId:          0,
 				},
-				Limit:  100,
+				Limit:  0,
 				Offset: 0,
 				With: GetFBSShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 					Translit:      true,
+					Barcodes:      true,
 				},
 			},
 			`{
@@ -214,6 +225,7 @@ func TestGetFBSShipmentsList(t *testing.T) {
 					  "order_id": 680420041,
 					  "order_number": "05708065-0029",
 					  "status": "awaiting_deliver",
+					  "substatus": "posting_awaiting_passport_data",
 					  "delivery_method": {
 						"id": 21321684811000,
 						"name": "Ozon Логистика самостоятельно, Красногорск",
@@ -278,11 +290,15 @@ func TestGetFBSShipmentsList(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetFBSShipmentsList(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetFBSShipmentsList(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFBSShipmentsListResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -339,11 +355,15 @@ func TestPackOrder(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().PackOrder(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().PackOrder(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PackOrderResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -416,11 +436,15 @@ func TestValidateLabelingCodes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ValidateLabelingCodes(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ValidateLabelingCodes(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ValidateLabelingCodesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -460,31 +484,8 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
 				  "order_id": 438764970,
 				  "order_number": "57195475-0050",
 				  "status": "awaiting_packaging",
-				  "delivery_method": {
-					"id": 18114520187000,
-					"name": "Ozon Логистика самостоятельно, Москва",
-					"warehouse_id": 18114520187000,
-					"warehouse": "Москва основной",
-					"tpl_provider_id": 24,
-					"tpl_provider": "Ozon Логистика"
-				  },
-				  "tracking_number": "",
-				  "tpl_integration_type": "ozon",
 				  "in_process_at": "2021-11-20T09:14:16Z",
 				  "shipment_date": "2021-11-23T10:00:00Z",
-				  "delivering_date": null,
-				  "provider_status": "",
-				  "delivery_price": "",
-				  "cancellation": {
-					"cancel_reason_id": 0,
-					"cancel_reason": "",
-					"cancellation_type": "",
-					"cancelled_after_ship": false,
-					"affect_cancellation_rating": false,
-					"cancellation_initiator": ""
-				  },
-				  "customer": null,
-				  "addressee": null,
 				  "products": [
 					{
 					  "price": "279.0000",
@@ -492,25 +493,12 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
 					  "name": "Кофе ароматизированный \"Шоколадный апельсин\" 250 гр",
 					  "sku": 180550365,
 					  "quantity": 1,
-					  "mandatory_mark": [],
+					  "mandatory_mark": []
-					  "dimensions": {
-						"height": "40.00",
-						"length": "240.00",
-						"weight": "260",
-						"width": "140.00"
-					  }
 					}
 				  ],
 				  "barcodes": null,
 				  "analytics_data": null,
-				  "financial_data": null,
+				  "financial_data": null
-				  "additional_data": [],
-				  "is_express": false,
-				  "requirements": {
-					"products_requiring_gtd": [],
-					"products_requiring_country": []
-				  },
-				  "product_exemplars": null
 				}
 			}`,
 		},
@@ -529,11 +517,15 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetShipmentDataByBarcode(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetShipmentDataByBarcode(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetShipmentDataByBarcodeResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -642,11 +634,15 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetShipmentDataByIdentifier(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetShipmentDataByIdentifier(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetShipmentDataByIdentifierResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -714,11 +710,15 @@ func TestAddTrackingNumbers(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().AddTrackingNumbers(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().AddTrackingNumbers(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AddTrackingNumbersResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -807,11 +807,15 @@ func TestListOfShipmentCertificates(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ListOfShipmentCertificates(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ListOfShipmentCertificates(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListOfShipmentCertificatesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -868,11 +872,15 @@ func TestSignShipmentCertificate(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().SignShipmentCertificate(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().SignShipmentCertificate(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &SignShipmentCertificateResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -943,24 +951,34 @@ func TestChangeStatusTo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		deliveringResp, err := c.FBS().ChangeStatusToDelivering(test.params)
+		deliveringctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		deliveringResp, err := c.FBS().ChangeStatusToDelivering(deliveringctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
-		lastMileResp, err := c.FBS().ChangeStatusToLastMile(test.params)
+		compareJsonResponse(t, test.response, &ChangeStatusToResponse{})
+
+		lastMilectx, _ := context.WithTimeout(context.Background(), testTimeout)
+		lastMileResp, err := c.FBS().ChangeStatusToLastMile(lastMilectx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
-		deliveredResp, err := c.FBS().ChangeStatusToDelivered(test.params)
+		deliveredctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		deliveredResp, err := c.FBS().ChangeStatusToDelivered(deliveredctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
-		sendBySellerResp, err := c.FBS().ChangeStatusToSendBySeller(test.params)
+		sendBySellerctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		sendBySellerResp, err := c.FBS().ChangeStatusToSendBySeller(sendBySellerctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		assertResponse(t, &test, deliveringResp)
@@ -1005,11 +1023,15 @@ func TestPassShipmentToShipping(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().PassShipmentToShipping(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().PassShipmentToShipping(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PassShipmentToShippingResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1053,11 +1075,15 @@ func TestCancelShipment(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().CancelShipment(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().CancelShipment(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CancelShipmentResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1103,11 +1129,15 @@ func TestCreateAct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().CreateAct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().CreateAct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateActResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1152,11 +1182,15 @@ func TestGetLabeling(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetLabeling(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetLabeling(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetLabelingResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1205,11 +1239,15 @@ func TestPrintLabeling(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().PrintLabeling(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().PrintLabeling(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PrintLabelingResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1259,11 +1297,15 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().CreateTaskForGeneratingLabel(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().CreateTaskForGeneratingLabel(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateTaskForGeneratingLabelResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1319,11 +1361,15 @@ func TestGetDropOffPointRestrictions(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetDropOffPointRestrictions(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetDropOffPointRestrictions(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetDropOffPointRestrictionsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1379,11 +1425,15 @@ func TestCheckProductItemsData(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().CheckproductItemsData(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().CheckProductItemsData(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CheckProductItemsDataResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1442,11 +1492,15 @@ func TestGetProductItemsCheckStatuses(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetProductItemsCheckStatuses(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetProductItemsCheckStatuses(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductItemsCheckStatusesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1510,11 +1564,15 @@ func TestRescheduleShipmentDeliveryDate(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().RescheduleShipmentDeliveryDate(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().RescheduleShipmentDeliveryDate(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &RescheduleShipmentDeliveryDateResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1561,11 +1619,15 @@ func TestDateAvailableForDeliverySchedule(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().DateAvailableForDeliverySchedule(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().DateAvailableForDeliverySchedule(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DateAvailableForDeliveryScheduleResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1620,11 +1682,15 @@ func TestListManufactoruingCountries(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ListManufacturingCountries(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ListManufacturingCountries(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListManufacturingCountriesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1680,11 +1746,15 @@ func TestSetManufacturingCountry(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().SetManufacturingCountry(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().SetManufacturingCountry(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &SetManufacturingCountryResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1747,11 +1817,15 @@ func TestPartialPackOrder(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().PartialPackOrder(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().PartialPackOrder(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PartialPackOrderResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1819,11 +1893,15 @@ func TestAvailableFreightsList(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().AvailableFreightsList(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().AvailableFreightsList(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AvailableFreightsListResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1866,11 +1944,15 @@ func TestGenerateAct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GenerateAct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GenerateAct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GenerateActResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1915,11 +1997,15 @@ func TestGetDigitalAct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetDigitalAct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetDigitalAct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetDigitalActResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1969,11 +2055,15 @@ func TestPackageUnitLabels(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().PackageUnitLabel(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().PackageUnitLabel(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &PackageUnitLabelsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2021,11 +2111,15 @@ func TestOpenDisputeOverShipment(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().OpenDisputeOverShipment(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().OpenDisputeOverShipment(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &OpenDisputeOverShipmentResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2088,11 +2182,15 @@ func TestShipmentCancellationReasons(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ShipmentCancellationReasons(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ShipmentCancellationReasons(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ShipmentCancellationReasonsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2183,11 +2281,15 @@ func TestShipmentsCancellationReasons(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ShipmentsCancellationReasons()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ShipmentsCancellationReasons(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ShipmentsCancellationReasonsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2244,11 +2346,15 @@ func TestAddWeightForBulkProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().AddWeightForBulkProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().AddWeightForBulkProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AddWeightForBulkProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2304,11 +2410,15 @@ func TestCancelSending(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().CancelSending(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().CancelSending(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CancelSendingResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2369,11 +2479,15 @@ func TestListShipmentInCertificate(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ListShipmentInCertificate(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ListShipmentInCertificate(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListShipmentInCertificateResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2417,11 +2531,15 @@ func TestSpecifyNumberOfBoxes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().SpecifyNumberOfBoxes(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().SpecifyNumberOfBoxes(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &SpecifyNumberOfBoxesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2446,7 +2564,13 @@ func TestStatusOfAct(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "result": true
+				  "added_to_act": [
+					"true"
+				  ],
+				  "removed_from_act": [
+					"false"
+				  ],
+				  "status": "ready"
 				}
 			}`,
 		},
@@ -2465,11 +2589,15 @@ func TestStatusOfAct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().StatusOfAct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().StatusOfAct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &StatusOfActResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2523,11 +2651,15 @@ func TestETGBCustomsDeclarations(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().ETGBCustomsDeclarations(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().ETGBCustomsDeclarations(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ETGBCustomsDeclarationsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2571,11 +2703,15 @@ func TestBarcodeFromProductShipment(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().BarcodeFromProductShipment(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().BarcodeFromProductShipment(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &BarcodeFromProductShipmentResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2629,11 +2765,15 @@ func TestBarcodeValueFromProductShipment(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().BarcodeValueFromProductShipment(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().BarcodeValueFromProductShipment(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &BarcodeValueFromProductShipmentResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2683,11 +2823,15 @@ func TestGetActPDF(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.FBS().GetActPDF(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.FBS().GetActPDF(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetActPDFResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/finance.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -20,12 +21,12 @@ type ReportOnSoldProductsResponse struct {
 	core.CommonResponse
 
 	// Query result
-	Result []ReportonSoldProductsResult `json:"result"`
+	Result ReportonSoldProductsResult `json:"result"`
 }
 
 type ReportonSoldProductsResult struct {
 	// Report title page
-	Header []ReportOnSoldProductsResultHeader `json:"header"`
+	Header ReportOnSoldProductsResultHeader `json:"header"`
 
 	// Report table
 	Rows []ReportOnSoldProductsResultRow `json:"rows"`
@@ -151,12 +152,12 @@ type ReportOnSoldProductsResultRow struct {
 // Returns information on products sold and returned within a month. Canceled or non-purchased products are not included.
 //
 // Report is returned no later than the 5th day of the next month
-func (c Finance) ReportOnSoldProducts(params *ReportOnSoldProductsParams) (*ReportOnSoldProductsResponse, error) {
+func (c Finance) ReportOnSoldProducts(ctx context.Context, params *ReportOnSoldProductsParams) (*ReportOnSoldProductsResponse, error) {
 	url := "/v1/finance/realization"
 
 	resp := &ReportOnSoldProductsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -210,7 +211,7 @@ type GetTotalTransactionsSumResult struct {
 	AccrualsForSale float64 `json:"accruals_for_sale"`
 
 	// Compensations
-	CompensationAmount float64 `json:"compensatino_amount"`
+	CompensationAmount float64 `json:"compensation_amount"`
 
 	// Charges for delivery and returns when working under rFBS scheme
 	MoneyTransfer float64 `json:"money_transfer"`
@@ -241,12 +242,12 @@ type GetTotalTransactionsSumResult struct {
 }
 
 // Returns total sums for transactions for specified period
-func (c Finance) GetTotalTransactionsSum(params *GetTotalTransactionsSumParams) (*GetTotalTransactionsSumResponse, error) {
+func (c Finance) GetTotalTransactionsSum(ctx context.Context, params *GetTotalTransactionsSumParams) (*GetTotalTransactionsSumResponse, error) {
 	url := "/v3/finance/transaction/totals"
 
 	resp := &GetTotalTransactionsSumResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -271,7 +272,7 @@ type ListTransactionsFilter struct {
 	Date ListTransactionsFilterDate `json:"date"`
 
 	// Operation type
-	OperationType string `json:"operation_type"`
+	OperationType []string `json:"operation_type"`
 
 	// Shipment number
 	PostingNumber string `json:"posting_number"`
@@ -390,12 +391,12 @@ type ListTransactionsResultOperationService struct {
 // Returns detailed information on all accruals. The maximum period for which you can get information in one request is 1 month.
 //
 // If you don't specify the posting_number in request, the response contains all shipments for the specified period or shipments of a certain type
-func (c Finance) ListTransactions(params *ListTransactionsParams) (*ListTransactionsResponse, error) {
+func (c Finance) ListTransactions(ctx context.Context, params *ListTransactionsParams) (*ListTransactionsResponse, error) {
 	url := "/v3/finance/transaction/list"
 
 	resp := &ListTransactionsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/finance_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -25,53 +26,49 @@ func TestReportOnSoldProducts(t *testing.T) {
 				Date: "2022-09",
 			},
 			`{
-				"result": [
+                "result": {
-					{
+                    "header": {
-						"header": [
+                        "doc_date": "2022-09-22",
-							{
+                        "num": "string",
-								"doc_date": "2022-09-22",
+                        "start_date": "2022-09-02",
-								"num": "string",
+                        "stop_date": "2022-09-22",
-								"start_date": "2022-09-02",
+                        "contract_date": "2022-09-02",
-								"stop_date": "2022-09-22",
+                        "contract_num": "string",
-								"contract_date": "2022-09-02",
+                        "payer_name": "string",
-								"contract_num": "string",
+                        "payer_inn": "string",
-								"payer_name": "string",
+                        "payer_kpp": "string",
-								"payer_inn": "string",
+                        "rcv_name": "string",
-								"payer_kpp": "string",
+                        "rcv_inn": "string",
-								"rcv_name": "string",
+                        "rcv_kpp": "string",
-								"rcv_inn": "string",
+                        "doc_amount": 1,
-								"rcv_kpp": "string",
+                        "vat_amount": 1,
-								"doc_amount": 1,
+                        "currency_code": "string"
-								"vat_amount": 1,
+                    },
-								"currency_code": "string"
+                    "rows": [
-							}
+                    {
-						],
+                        "row_number": 0,
-						"rows": [
+                        "product_id": 0,
-							{
+                        "product_name": "string",
-								"row_number": 0,
+                        "offer_id": "string",
-								"product_id": 0,
+                        "barcode": "string",
-								"product_name": "string",
+                        "price": 0,
-								"offer_id": "string",
+                        "commission_percent": 0,
-								"barcode": "string",
+                        "price_sale": 0,
-								"price": 0,
+                        "sale_qty": 0,
-								"commission_percent": 0,
+                        "sale_amount": 0,
-								"price_sale": 0,
+                        "sale_discount": 0,
-								"sale_qty": 0,
+                        "sale_commission": 0,
-								"sale_amount": 0,
+                        "sale_price_seller": 0,
-								"sale_discount": 0,
+                        "return_sale": 0,
-								"sale_commission": 0,
+                        "return_qty": 0,
-								"sale_price_seller": 0,
+                        "return_amount": 0,
-								"return_sale": 0,
+                        "return_discount": 0,
-								"return_qty": 0,
+                        "return_commission": 0,
-								"return_amount": 0,
+                        "return_price_seller": 0
-								"return_discount": 0,
+                    }
-								"return_commission": 0,
+                    ]
-								"return_price_seller": 0
+                }
-							}
+            }`,
-						]
-					}
-				]
-			}`,
 			"",
 		},
 		// Test No Client-Id or Api-Key
@@ -90,11 +87,15 @@ func TestReportOnSoldProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Finance().ReportOnSoldProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Finance().ReportOnSoldProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ReportOnSoldProductsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -158,11 +159,15 @@ func TestGetTotalTransactionsSum(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Finance().GetTotalTransactionsSum(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Finance().GetTotalTransactionsSum(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetTotalTransactionsSumResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -246,11 +251,15 @@ func TestListTransactions(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Finance().ListTransactions(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Finance().ListTransactions(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListTransactionsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/invoices.go

@@ -1,7 +1,9 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
+	"time"
 
 	core "github.com/diphantxm/ozon-api-client"
 )
@@ -16,6 +18,21 @@ type CreateUpdateProformaLinkParams struct {
 
 	// Proforma invoice link
 	URL string `json:"url"`
+
+	// Invoice HS-code. Pass a number up to 12 characters long
+	HSCode string `json:"hs_code"`
+
+	// Invoice date
+	Date time.Time `json:"date"`
+
+	// Invoice number. The number can contain letters and digits, maximum length is 50 characters
+	Number string `json:"number"`
+
+	// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal poin
+	Price float64 `json:"price"`
+
+	// Invoice currency
+	PriceCurrency InvoiceCurrency `json:"price_currency" default:"USD"`
 }
 
 type CreateUpdateProformaLinkResponse struct {
@@ -26,12 +43,12 @@ type CreateUpdateProformaLinkResponse struct {
 }
 
 // Create or edit proforma invoice link for VAT refund to Turkey sellers
-func (c Invoices) CreateUpdate(params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
+func (c Invoices) CreateUpdate(ctx context.Context, params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
 	url := "/v1/invoice/create-or-update"
 
 	resp := &CreateUpdateProformaLinkResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -58,12 +75,12 @@ type GetProformaLinkResult struct {
 }
 
 // Get a proforma invoice link
-func (c Invoices) Get(params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
+func (c Invoices) Get(ctx context.Context, params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
 	url := "/v1/invoice/get"
 
 	resp := &GetProformaLinkResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -84,12 +101,12 @@ type DeleteProformaLinkResponse struct {
 	Result bool `json:"result"`
 }
 
-func (c Invoices) Delete(params *DeleteProformaLinkParams) (*DeleteProformaLinkResponse, error) {
+func (c Invoices) Delete(ctx context.Context, params *DeleteProformaLinkParams) (*DeleteProformaLinkResponse, error) {
 	url := "/v1/invoice/delete"
 
 	resp := &DeleteProformaLinkResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/invoices_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -21,8 +22,13 @@ func TestCreateUpdateProformaLink(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&CreateUpdateProformaLinkParams{
-				PostingNumber: "posting number",
+				PostingNumber: "33920146-0252-1",
-				URL:           "link",
+				URL:           "https://cdn.ozone.ru/s3/ozon-disk-api/techdoc/seller-api/earsivfatura_1690960445.pdf",
+				HSCode:        "2134322",
+				Date:          core.TimeFromString(t, "2006-01-02T15:04:05Z", "2023-08-01T12:08:44.342Z"),
+				Number:        "424fdsf234",
+				Price:         234.34,
+				PriceCurrency: InvoiceCurrencyRUB,
 			},
 			`{
 				"result": true
@@ -43,11 +49,15 @@ func TestCreateUpdateProformaLink(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Invoices().CreateUpdate(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Invoices().CreateUpdate(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateUpdateProformaLinkResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -91,11 +101,15 @@ func TestGetProformaLink(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Invoices().Get(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Invoices().Get(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProformaLinkResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -137,11 +151,15 @@ func TestDeleteProformaLink(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Invoices().Delete(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Invoices().Delete(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DeleteProformaLinkResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/notifications/server.go

@@ -53,12 +53,7 @@ func (ns *NotificationServer) handler(rw http.ResponseWriter, httpReq *http.Requ
 			Name:    "Ozon Seller API",
 			Time:    time.Now(),
 		}
-		respJson, err := json.Marshal(resp)
+		respJson, _ := json.Marshal(resp)
-		if err != nil {
-			log.Print(err)
-			ns.error(rw, http.StatusInternalServerError, err)
-			return
-		}
 
 		rw.WriteHeader(http.StatusOK)
 		rw.Write(respJson)
@@ -68,8 +63,7 @@ func (ns *NotificationServer) handler(rw http.ResponseWriter, httpReq *http.Requ
 	req, err := ns.unmarshal(mt.MessageType, content)
 	if err != nil {
 		log.Print(err)
-		ns.result(rw, false)
+		ns.error(rw, http.StatusInternalServerError, err)
-		//ns.error(rw, http.StatusInternalServerError, err)
 		return
 	}
 	h, ok := ns.handlers[mt.MessageType]
@@ -80,8 +74,7 @@ func (ns *NotificationServer) handler(rw http.ResponseWriter, httpReq *http.Requ
 	}
 	if err := h(req); err != nil {
 		log.Print(err)
-		ns.result(rw, false)
+		ns.result(rw, true)
-		//ns.error(rw, http.StatusInternalServerError, err)
 		return
 	}
 

ozon/notifications/server_test.go

@@ -10,55 +10,451 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	core "github.com/diphantxm/ozon-api-client"
 )
 
+type testData struct {
+	raw    string
+	object interface{}
+}
+
+func pingTest(t *testing.T) testData {
+	return testData{
+		object: &pingRequest{
+			Common: Common{MessageType: PingType},
+			Time:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+		},
+		raw: `{
+			"message_type": "TYPE_PING",
+			"time": "2019-08-24T14:15:22Z"
+		}`,
+	}
+}
+
+func newPostingTest(t *testing.T) testData {
+	return testData{
+		object: &NewPosting{
+			Common:        Common{MessageType: NewPostingType},
+			PostingNumber: "24219509-0020-1",
+			Products: []Product{
+				{
+					SKU:      147451959,
+					Quantity: 2,
+				},
+			},
+			InProccessAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-01-26T06:56:36.294Z"),
+			WarehouseId:  18850503335000,
+			SellerId:     15,
+		},
+		raw: `{
+			"message_type": "TYPE_NEW_POSTING",
+			"posting_number": "24219509-0020-1",
+			"products": [
+			  {
+				"sku": 147451959,
+				"quantity": 2
+			  }
+			],
+			"in_process_at": "2021-01-26T06:56:36.294Z",
+			"warehouse_id": 18850503335000,
+			"seller_id": 15
+		}`,
+	}
+}
+
+func postingCancelledTest(t *testing.T) testData {
+	return testData{
+		object: &PostingCancelled{
+			Common:        Common{MessageType: PostingCancelledType},
+			PostingNumber: "24219509-0020-1",
+			Products: []Product{
+				{
+					SKU:      147451959,
+					Quantity: 1,
+				},
+			},
+			OldState:         "posting_transferred_to_courier_service",
+			NewState:         "posting_canceled",
+			ChangedStateDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-01-26T06:56:36.294Z"),
+			Reason:           Reason{Id: 1, Message: "message"},
+			WarehouseId:      1,
+			SellerId:         15,
+		},
+		raw: `{
+			"message_type": "TYPE_POSTING_CANCELLED",
+			"posting_number": "24219509-0020-1",
+			"products": [
+			  {
+				"sku": 147451959,
+				"quantity": 1
+			  }
+			],
+			"old_state": "posting_transferred_to_courier_service",
+			"new_state": "posting_canceled",
+			"changed_state_date": "2021-01-26T06:56:36.294Z",
+			"reason": {
+			  "id": 1,
+			  "message": "message"
+			},
+			"warehouse_id": 1,
+			"seller_id": 15
+		}`,
+	}
+}
+
+func cutoffDateChangedTest(t *testing.T) testData {
+	return testData{
+		object: &CutoffDateChanged{
+			Common:        Common{MessageType: CutoffDateChangedType},
+			PostingNumber: "24219509-0020-2",
+			NewCutoffDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-24T07:00:00Z"),
+			OldCutoffDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-21T10:00:00Z"),
+			WarehouseId:   1,
+			SellerId:      15,
+		},
+		raw: `{
+			"message_type": "TYPE_CUTOFF_DATE_CHANGED",
+			"posting_number": "24219509-0020-2",
+			"new_cutoff_date": "2021-11-24T07:00:00Z",
+			"old_cutoff_date": "2021-11-21T10:00:00Z",
+			"warehouse_id": 1,
+			"seller_id": 15
+		}`,
+	}
+}
+
+func deliveryDateChangedTest(t *testing.T) testData {
+	return testData{
+		object: &DeliveryDateChanged{
+			Common:               Common{MessageType: DeliveryDateChangedType},
+			PostingNumber:        "24219509-0020-2",
+			NewDeliveryDateBegin: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-24T07:00:00Z"),
+			NewDeliveryDateEnd:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-24T16:00:00Z"),
+			OldDeliveryDateBegin: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-21T10:00:00Z"),
+			OldDeliveryDateEnd:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-21T19:00:00Z"),
+			WarehouseId:          1,
+			SellerId:             15,
+		},
+		raw: `{
+			"message_type": "TYPE_DELIVERY_DATE_CHANGED",
+			"posting_number": "24219509-0020-2",
+			"new_delivery_date_begin": "2021-11-24T07:00:00Z",
+			"new_delivery_date_end": "2021-11-24T16:00:00Z",
+			"old_delivery_date_begin": "2021-11-21T10:00:00Z",
+			"old_delivery_date_end": "2021-11-21T19:00:00Z",
+			"warehouse_id": 1,
+			"seller_id": 15
+		}`,
+	}
+}
+
+func priceIndexChangedTest(t *testing.T) testData {
+	return testData{
+		object: &PriceIndexChanged{
+			Common:     Common{MessageType: PriceIndexChangedType},
+			UpdatedAt:  core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-06-21T05:52:46.648533678Z"),
+			SKU:        147451959,
+			ProductId:  1234,
+			PriceIndex: 5678,
+			SellerId:   15,
+		},
+		raw: `{
+			"seller_id": 15,
+			"message_type": "TYPE_PRICE_INDEX_CHANGED",
+			"updated_at":"2022-06-21T05:52:46.648533678Z",
+			"sku": 147451959,
+			"product_id": 1234,
+			"price_index": 5678
+		}`,
+	}
+}
+
+func stocksChangedTest(t *testing.T) testData {
+	return testData{
+		object: &StocksChanged{
+			Common: Common{MessageType: StocksChangedType},
+			Items: []Item{
+				{
+					UpdatedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-01T14:15:22Z"),
+					SKU:       5678,
+					ProductId: 1234,
+					Stocks: []Stock{
+						{
+							WarehouseId: 10,
+							Present:     50,
+							Reserved:    5,
+						},
+					},
+				},
+			},
+			SellerId: 15,
+		},
+		raw: `{
+			"message_type": "TYPE_STOCKS_CHANGED",
+			"seller_id": 15,
+			"items": [
+			  {
+				"product_id": 1234,
+				"sku": 5678,
+				"updated_at": "2021-09-01T14:15:22Z",
+				"stocks": [
+				  {
+					"warehouse_id": 10,
+					"present": 50,
+					"reserved": 5
+				  }
+				]
+			  }
+			]
+		}`,
+	}
+}
+
+func newMessageTest(t *testing.T) testData {
+	return testData{
+		object: &NewMessage{
+			Common:    Common{MessageType: NewMessageType},
+			ChatId:    "b646d975-0c9c-4872-9f41-8b1e57181063",
+			ChatType:  "Buyer_Seller",
+			MessageId: "3000000000817031942",
+			CreatedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-07-18T20:58:04.528Z"),
+			User:      User{Id: "115568", Type: "Customer"},
+			Data:      []string{"Message text"},
+			SellerId:  7,
+		},
+		raw: `{  
+			"message_type": "TYPE_NEW_MESSAGE",
+			"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
+			"chat_type": "Buyer_Seller",
+			"message_id": "3000000000817031942",
+			"created_at": "2022-07-18T20:58:04.528Z",
+			"user": {
+				"id": "115568",
+				"type": "Customer"
+			},
+			"data": [
+				"Message text"
+			],  
+			"seller_id": 7
+		}`,
+	}
+}
+
+func updateMessageTest(t *testing.T) testData {
+	return testData{
+		object: &UpdateMessage{
+			NewMessage: NewMessage{
+				Common:    Common{MessageType: UpdateMessageType},
+				ChatId:    "b646d975-0c9c-4872-9f41-8b1e57181063",
+				ChatType:  "Buyer_Seller",
+				MessageId: "3000000000817031942",
+				CreatedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-07-18T20:58:04.528Z"),
+				User: User{
+					Id:   "115568",
+					Type: "Сustomer",
+				},
+				Data:     []string{"Message text"},
+				SellerId: 7,
+			},
+			UpdatedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-07-18T20:59:04.528Z"),
+		},
+		raw: `{  
+			"message_type": "TYPE_UPDATE_MESSAGE",
+			"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
+			"chat_type": "Buyer_Seller",
+			"message_id": "3000000000817031942",
+			"created_at": "2022-07-18T20:58:04.528Z",
+			"updated_at": "2022-07-18T20:59:04.528Z",
+			"user": {
+				"id": "115568",
+				"type": "Сustomer"
+			},
+			"data": [
+				"Message text"
+			], 
+			"seller_id": 7
+		}`,
+	}
+}
+
+func createUpdateItemTest(t *testing.T) testData {
+	return testData{
+		object: &CreateOrUpdateItem{
+			Common:    Common{MessageType: "TYPE_CREATE_OR_UPDATE_ITEM"},
+			OfferId:   "1234",
+			ProductId: 5678,
+			IsError:   false,
+			ChangedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-09-01T14:15:22Z"),
+			SellerId:  15,
+		},
+		raw: `{
+			"message_type": "TYPE_CREATE_OR_UPDATE_ITEM",
+			"seller_id": 15,
+			"offer_id": "1234",
+			"product_id": 5678,
+			"is_error": false,
+			"changed_at": "2022-09-01T14:15:22Z"
+		}`,
+	}
+}
+
+func stateChangedTest(t *testing.T) testData {
+	return testData{
+		object: &StateChanged{
+			Common:           Common{MessageType: "TYPE_STATE_CHANGED"},
+			PostingNumber:    "24219509-0020-2",
+			NewState:         "posting_delivered",
+			ChangedStateDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-02-02T15:07:46.765Z"),
+			WarehouseId:      1,
+			SellerId:         15,
+		},
+		raw: `{
+			"message_type": "TYPE_STATE_CHANGED",
+			"posting_number": "24219509-0020-2",
+			"new_state": "posting_delivered",
+			"changed_state_date": "2021-02-02T15:07:46.765Z",
+			"warehouse_id": 1,
+			"seller_id": 15
+		}`,
+	}
+}
+
+func messageReadTest(t *testing.T) testData {
+	return testData{
+		object: &MessageRead{
+			LastReadMessageId: "3000000000817031942",
+			NewMessage: NewMessage{
+				Common:    Common{MessageType: "TYPE_MESSAGE_READ"},
+				ChatId:    "b646d975-0c9c-4872-9f41-8b1e57181063",
+				ChatType:  "Buyer_Seller",
+				MessageId: "3000000000817031942",
+				CreatedAt: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2022-07-18T20:58:04.528Z"),
+				User: User{
+					Id:   "115568",
+					Type: "Сustomer",
+				},
+				SellerId: 7,
+			},
+		},
+		raw: `{  
+			"message_type": "TYPE_MESSAGE_READ",
+			"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
+			"chat_type": "Buyer_Seller",
+			"message_id": "3000000000817031942",
+			"created_at": "2022-07-18T20:58:04.528Z",    
+			"user": {
+				"id": "115568",
+				"type": "Сustomer"
+			},
+			"last_read_message_id": "3000000000817031942",
+			"seller_id": 7
+		}`,
+	}
+}
+
+func chatClosedTest(t *testing.T) testData {
+	return testData{
+		object: &ChatClosed{
+			Common:   Common{MessageType: ChatClosedType},
+			ChatId:   "b646d975-0c9c-4872-9f41-8b1e57181063",
+			ChatType: "Buyer_Seller",
+			User:     User{Id: "115568", Type: "Customer"},
+			SellerId: 7,
+		},
+		raw: `{  
+			"message_type": "TYPE_CHAT_CLOSED",
+			"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
+			"chat_type": "Buyer_Seller",
+			"user": {
+				"id": "115568",
+				"type": "Customer"
+			},
+			"seller_id": 7
+		}`,
+	}
+}
+
 func TestNotificationServer(t *testing.T) {
 	testCases := []struct {
-		request  string
+		request  testData
 		response string
 	}{
-		// PING
 		{
-			`{
+			pingTest(t),
-				"message_type": "TYPE_PING",
-				"time": "2019-08-24T14:15:22Z"
-			}`,
 			`{
 				"version": "1.0",
 				"name": "Ozon Seller API"
 			}`,
 		},
-		// REGISTERED HANDLER
 		{
-			`{  
+			newPostingTest(t),
-				"message_type": "TYPE_CHAT_CLOSED",
-				"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
-				"chat_type": "Buyer_Seller",
-				"user": {
-					"id": "115568",
-					"type": "Сustomer"
-				},
-				"seller_id": "7"
-			}`,
 			`{
 				"result": true
 			}`,
 		},
-		// UNREGISTERED HANDLER
 		{
+			postingCancelledTest(t),
 			`{
-				"message_type": "TYPE_MESSAGE_READ",
+				"result": true
-				"chat_id": "b646d975-0c9c-4872-9f41-8b1e57181063",
-				"chat_type": "Buyer_Seller",
-				"message_id": "3000000000817031942",
-				"created_at": "2022-07-18T20:58:04.528Z",    
-				"user": {
-					"id": "115568",
-					"type": "Сustomer"
-				},
-				"last_read_message_id": "3000000000817031942",
-				"seller_id": "7"
 			}`,
+		},
+		{
+			stateChangedTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			cutoffDateChangedTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			deliveryDateChangedTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			createUpdateItemTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			priceIndexChangedTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			stocksChangedTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			newMessageTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			updateMessageTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			messageReadTest(t),
+			`{
+				"result": true
+			}`,
+		},
+		{
+			chatClosedTest(t),
 			`{
 				"result": true
 			}`,
@@ -69,13 +465,18 @@ func TestNotificationServer(t *testing.T) {
 
 	client := http.Client{}
 	server := NewNotificationServer(port)
-	server.Register(ChatClosedType, func(req interface{}) error {
+	server.Register(NewPostingType, comparatorWith(newPostingTest(t).object))
-		_, ok := req.(*ChatClosed)
+	server.Register(PostingCancelledType, comparatorWith(postingCancelledTest(t).object))
-		if !ok {
+	server.Register(StateChangedType, comparatorWith(stateChangedTest(t).object))
-			return fmt.Errorf("req is not of ChatClosed type")
+	server.Register(CutoffDateChangedType, comparatorWith(cutoffDateChangedTest(t).object))
-		}
+	server.Register(DeliveryDateChangedType, comparatorWith(deliveryDateChangedTest(t).object))
-		return nil
+	server.Register(CreateOrUpdateType, comparatorWith(createUpdateItemTest(t).object))
-	})
+	server.Register(PriceIndexChangedType, comparatorWith(priceIndexChangedTest(t).object))
+	server.Register(StocksChangedType, comparatorWith(stocksChangedTest(t).object))
+	server.Register(NewMessageType, comparatorWith(newMessageTest(t).object))
+	server.Register(UpdateMessageType, comparatorWith(updateMessageTest(t).object))
+	server.Register(MessageReadType, comparatorWith(messageReadTest(t).object))
+	server.Register(ChatClosedType, comparatorWith(chatClosedTest(t).object))
 	go func() {
 		if err := server.Run(); err != nil {
 			t.Fatalf("notification server is down: %s", err)
@@ -87,7 +488,7 @@ func TestNotificationServer(t *testing.T) {
 	time.Sleep(3 * time.Second)
 
 	for _, testCase := range testCases {
-		httpResp, err := client.Post(fmt.Sprintf("http://0.0.0.0:%d/", port), "application/json", strings.NewReader(testCase.request))
+		httpResp, err := client.Post(fmt.Sprintf("http://0.0.0.0:%d/", port), "application/json", strings.NewReader(testCase.request.raw))
 		if err != nil {
 			t.Error(err)
 			continue
@@ -104,8 +505,13 @@ func TestNotificationServer(t *testing.T) {
 		err = json.Unmarshal(gotJson, &got)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 		err = json.Unmarshal([]byte(testCase.response), &expected)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
 
 		if err := compare(expected, got); err != nil {
 			t.Error(err)
@@ -114,6 +520,145 @@ func TestNotificationServer(t *testing.T) {
 	}
 }
 
+func TestNotificationServerErrors(t *testing.T) {
+	testCases := []struct {
+		request  testData
+		response string
+	}{
+		{
+			testData{
+				raw: `{
+					"message_type": "string"
+				}`,
+			},
+			`
+			{
+				"error": {
+					"code": "500",
+					"message": "unsupported type: string",
+					"details": ""
+				}
+			}`,
+		},
+		{
+			testData{
+				raw: `invalid json`,
+			},
+			`{
+				"error": {
+					"code": "400",
+					"message": "invalid character 'i' looking for beginning of value",
+					"details": ""
+				}
+			}`,
+		},
+		{
+			testData{
+				raw: `{
+					"message_type": "TYPE_NEW_POSTING",
+					"field": [[
+				}`,
+			},
+			`{
+				"error": {
+					"code": "400",
+					"message": "invalid character '}' looking for beginning of value",
+					"details": ""
+				}
+			}`,
+		},
+		{
+			testData{
+				raw: `{
+					"message_type": "TYPE_NEW_POSTING"
+				}`,
+			},
+			`{
+				"result": true
+			}`,
+		},
+		{
+			testData{
+				raw: `{
+					"message_type": "TYPE_PING",
+					"time": "2019-08-24T14:15:22Z",
+				}`,
+			},
+			`{
+				"error": {
+					"code": "400",
+					"message": "invalid character '}' looking for beginning of object key string",
+					"details": ""
+				}
+			}`,
+		},
+		{
+			testData{
+				raw: `{
+					"message_type": "TYPE_CHAT_CLOSED"
+				}`,
+			},
+			`{
+				"result": true
+			}`,
+		},
+	}
+
+	port := getFreePort()
+
+	client := http.Client{}
+	server := NewNotificationServer(port)
+	server.Register(NewPostingType, func(req interface{}) error {
+		return fmt.Errorf("just error")
+	})
+	go func() {
+		if err := server.Run(); err != nil {
+			t.Fatalf("notification server is down: %s", err)
+		}
+	}()
+
+	// TODO: get rid of it
+	// Needed to make sure server is running
+	time.Sleep(3 * time.Second)
+
+	for _, testCase := range testCases {
+		httpResp, err := client.Post(fmt.Sprintf("http://0.0.0.0:%d/", port), "application/json", strings.NewReader(testCase.request.raw))
+		if err != nil {
+			t.Error(err)
+			continue
+			continue
+		}
+
+		gotJson, err := ioutil.ReadAll(httpResp.Body)
+		if err != nil {
+			t.Error(err)
+			continue
+			continue
+		}
+
+		expected := map[string]interface{}{}
+		got := map[string]interface{}{}
+		err = json.Unmarshal(gotJson, &got)
+		if err != nil {
+			t.Error(err)
+			continue
+			continue
+		}
+		err = json.Unmarshal([]byte(testCase.response), &expected)
+		if err != nil {
+			t.Error(err)
+			continue
+			continue
+		}
+
+		if err := compare(expected, got); err != nil {
+			t.Error(err)
+			continue
+			continue
+		}
+	}
+}
+
 func compare(expected map[string]interface{}, got map[string]interface{}) error {
 	for k, v := range expected {
 		if gotValue, ok := got[k]; !ok {
@@ -131,3 +676,12 @@ func getFreePort() int {
 
 	return listener.Addr().(*net.TCPAddr).Port
 }
+
+func comparatorWith(v1 interface{}) func(v2 interface{}) error {
+	return func(v2 interface{}) error {
+		if !reflect.DeepEqual(v1, v2) {
+			return fmt.Errorf("objects are not equal:\n got: %#v,\n want: %#v", v2, v1)
+		}
+		return nil
+	}
+}

ozon/notifications/types.go

@@ -42,7 +42,7 @@ type NewPosting struct {
 	WarehouseId int64 `json:"warehouse_id"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 type Product struct {
@@ -79,7 +79,7 @@ type PostingCancelled struct {
 	WarehouseId int64 `json:"warehouse_id"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 type Reason struct {
@@ -101,13 +101,13 @@ type StateChanged struct {
 	NewState string `json:"new_state"`
 
 	// Date and time when the shipment status was changed in UTC format
-	ChangedStateDate time.Time `json:"chagned_state_date"`
+	ChangedStateDate time.Time `json:"changed_state_date"`
 
 	// Warehouse identifier where the products for this shipment are stored
 	WarehouseId int64 `json:"warehouse_id"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 // Shipment shipping date change
@@ -127,7 +127,7 @@ type CutoffDateChanged struct {
 	WarehouseId int64 `json:"warehouse_id"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 // Shipment delivery date change
@@ -153,7 +153,7 @@ type DeliveryDateChanged struct {
 	WarehouseId int64 `json:"warehouse_id"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 // Product creation and update or processing error
@@ -173,7 +173,7 @@ type CreateOrUpdateItem struct {
 	ChangedAt time.Time `json:"changed_at"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 // Product price index change
@@ -193,7 +193,7 @@ type PriceIndexChanged struct {
 	PriceIndex int64 `json:"price_index"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 // Stock change at the seller's warehouse
@@ -204,7 +204,7 @@ type StocksChanged struct {
 	Items []Item `json:"items"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 type Item struct {
@@ -255,7 +255,7 @@ type NewMessage struct {
 	Data []string `json:"data"`
 
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 type User struct {
@@ -295,14 +295,8 @@ type ChatClosed struct {
 	// Information about the user who closed the chat
 	User User `json:"user"`
 
-	// User identifier
-	Id string `json:"id"`
-
-	// User type
-	Type string `json:"type"`
-
 	// Seller identifier
-	SellerId string `json:"seller_id"`
+	SellerId int64 `json:"seller_id"`
 }
 
 type Response struct {

ozon/ozon.go

@@ -31,6 +31,7 @@ type Client struct {
 	chats         *Chats
 	certificates  *Certificates
 	strategies    *Strategies
+	barcodes      *Barcodes
 }
 
 func (c Client) Analytics() *Analytics {
@@ -105,8 +106,12 @@ func (c Client) Strategies() *Strategies {
 	return c.strategies
 }
 
-func NewClient(clientId, apiKey string) *Client {
+func (c Client) Barcodes() *Barcodes {
-	coreClient := core.NewClient(DefaultAPIBaseUrl, map[string]string{
+	return c.barcodes
+}
+
+func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
+	coreClient := core.NewClient(httpClient, DefaultAPIBaseUrl, map[string]string{
 		"Client-Id": clientId,
 		"Api-Key":   apiKey,
 	})
@@ -131,6 +136,7 @@ func NewClient(clientId, apiKey string) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
+		barcodes:      &Barcodes{client: coreClient},
 	}
 }
 
@@ -157,5 +163,6 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
+		barcodes:      &Barcodes{client: coreClient},
 	}
 }

ozon/polygons.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 
 	core "github.com/diphantxm/ozon-api-client"
@@ -25,12 +26,12 @@ type CreateDeliveryPolygonResponse struct {
 // You can link a polygon to the delivery method.
 //
 // Create a polygon getting its coordinates on https://geojson.io: mark at least 3 points on the map and connect them
-func (c Polygons) CreateDelivery(params *CreateDeliveryPolygonParams) (*CreateDeliveryPolygonResponse, error) {
+func (c Polygons) CreateDelivery(ctx context.Context, params *CreateDeliveryPolygonParams) (*CreateDeliveryPolygonResponse, error) {
 	url := "/v1/polygon/create"
 
 	resp := &CreateDeliveryPolygonResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -71,36 +72,12 @@ type LinkDeliveryMethodToPolygonResponse struct {
 }
 
 // Link delivery method to a delivery polygon
-func (c Polygons) Link(params *LinkDeliveryMethodToPolygonParams) (*LinkDeliveryMethodToPolygonResponse, error) {
+func (c Polygons) Link(ctx context.Context, params *LinkDeliveryMethodToPolygonParams) (*LinkDeliveryMethodToPolygonResponse, error) {
 	url := "/v1/polygon/bind"
 
 	resp := &LinkDeliveryMethodToPolygonResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type DeletePolygonParams struct {
-	// Polygons identifiers list
-	PolygonIds []int64 `json:"polygon_ids"`
-}
-
-type DeletePolygonResponse struct {
-	core.CommonResponse
-}
-
-// Delete polygon
-func (c Polygons) Delete(params *DeletePolygonParams) (*DeletePolygonResponse, error) {
-	url := "/v1/polygon/delete"
-
-	resp := &DeletePolygonResponse{}
-
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/polygons_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -24,7 +25,7 @@ func TestCreateDeliveryPolygon(t *testing.T) {
 				Coordinates: "[[[30.149574279785153,59.86550435303646],[30.21205902099609,59.846884387977326],[30.255661010742184,59.86240174913176],[30.149574279785153,59.86550435303646]]]",
 			},
 			`{
-				"polygonId": "1323"
+				"polygon_id": 1323
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -42,11 +43,15 @@ func TestCreateDeliveryPolygon(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Polygons().CreateDelivery(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Polygons().CreateDelivery(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateDeliveryPolygonResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -96,55 +101,15 @@ func TestLinkDeliveryMethodToPolygon(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Polygons().Link(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		if err != nil {
+		resp, err := c.Polygons().Link(ctx, test.params)
-			t.Error(err)
-		}
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestDeletePolygon(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *DeletePolygonParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&DeletePolygonParams{
-				PolygonIds: []int64{1323},
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&DeletePolygonParams{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-		},
-	}
-
-	for _, test := range tests {
-		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
-
-		resp, err := c.Polygons().Delete(test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &LinkDeliveryMethodToPolygonResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/products.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -15,66 +16,66 @@ type GetStocksInfoParams struct {
 	// Identifier of the last value on the page. Leave this field blank in the first request.
 	//
 	// To get the next values, specify last_id from the response of the previous request.
-	LastId string `json:"last_id,omitempty"`
+	LastId string `json:"last_id"`
 
 	// Number of values per page. Minimum is 1, maximum is 1000
-	Limit int64 `json:"limit,omitempty"`
+	Limit int64 `json:"limit"`
 
 	// Filter by product
-	Filter GetStocksInfoFilter `json:"filter,omitempty"`
+	Filter GetStocksInfoFilter `json:"filter"`
 }
 
 type GetStocksInfoFilter struct {
 	// Filter by the offer_id parameter. It is possible to pass a list of values
-	OfferId string `json:"offer_id,omitempty"`
+	OfferId string `json:"offer_id"`
 
 	// Filter by the product_id parameter. It is possible to pass a list of values
-	ProductId int64 `json:"product_id,omitempty"`
+	ProductId int64 `json:"product_id"`
 
 	// Filter by product visibility
-	Visibility string `json:"visibility,omitempty"`
+	Visibility string `json:"visibility"`
 }
 
 type GetStocksInfoResponse struct {
 	core.CommonResponse
 
 	// Method Result
-	Result GetStocksInfoResult `json:"result,omitempty"`
+	Result GetStocksInfoResult `json:"result"`
 }
 
 type GetStocksInfoResult struct {
 	// Identifier of the last value on the page
 	//
 	// To get the next values, specify the recieved value in the next request in the last_id parameter
-	LastId string `json:"last_id,omitempty"`
+	LastId string `json:"last_id"`
 
 	// The number of unique products for which information about stocks is displayed
-	Total int32 `json:"total,omitempty"`
+	Total int32 `json:"total"`
 
 	// Product details
-	Items []GetStocksInfoResultItem `json:"items,omitempty"`
+	Items []GetStocksInfoResultItem `json:"items"`
 }
 
 type GetStocksInfoResultItem struct {
 	// Product identifier in the seller's system
-	OfferId string `json:"offer_id,omitempty"`
+	OfferId string `json:"offer_id"`
 
 	// Product identifier
-	ProductId int64 `json:"product_id,omitempty"`
+	ProductId int64 `json:"product_id"`
 
 	// Stock details
-	Stocks []GetStocksInfoResultItemStock `json:"stocks,omitempty"`
+	Stocks []GetStocksInfoResultItemStock `json:"stocks"`
 }
 
 type GetStocksInfoResultItemStock struct {
 	// In a warehouse
-	Present int32 `json:"present,omitempty"`
+	Present int32 `json:"present"`
 
 	// Reserved
-	Reserved int32 `json:"reserved,omitempty"`
+	Reserved int32 `json:"reserved"`
 
 	// Warehouse type
-	Type string `json:"type,omitempty" default:"ALL"`
+	Type string `json:"type" default:"ALL"`
 }
 
 // Returns information about the quantity of products in stock:
@@ -82,12 +83,12 @@ type GetStocksInfoResultItemStock struct {
 // * how many items are available,
 //
 // * how many are reserved by customers.
-func (c Products) GetStocksInfo(params *GetStocksInfoParams) (*GetStocksInfoResponse, error) {
+func (c Products) GetStocksInfo(ctx context.Context, params *GetStocksInfoParams) (*GetStocksInfoResponse, error) {
 	url := "/v3/product/info/stocks"
 
 	resp := &GetStocksInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +112,7 @@ type GetProductDetailsResponse struct {
 	core.CommonResponse
 
 	// Request results
-	Result ProductDetails `json:"Result"`
+	Result ProductDetails `json:"result"`
 }
 
 type ProductDetails struct {
@@ -127,7 +128,7 @@ type ProductDetails struct {
 	BuyboxPrice string `json:"buybox_price"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Marketing color
 	ColorImage string `json:"color_image"`
@@ -138,11 +139,8 @@ type ProductDetails struct {
 	// Date and time when the product was created
 	CreatedAt time.Time `json:"created_at"`
 
-	// SKU of the product that is sold from the Ozon warehouse (FBO)
+	// Product SKU
-	FBOSKU int64 `json:"fbo_sku"`
+	SKU int64 `json:"sku"`
-
-	// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
-	FBSSKU int64 `json:"fbs_sku"`
 
 	// Document generation task number
 	Id int64 `json:"id"`
@@ -212,12 +210,12 @@ type ProductDetails struct {
 	Price string `json:"price"`
 
 	// Product price indexes
-	PriceIndexes ProductDetailPriceIndex `json:"prices_indexes"`
+	PriceIndexes ProductDetailPriceIndex `json:"price_indexes"`
 
 	// Deprecated: Price index. Learn more in Help Center
 	//
 	// Use PriceIndexes instead
-	PriceIndex string `json:"price_idnex"`
+	PriceIndex string `json:"price_index"`
 
 	// Product price suggested by the system based on similar offers
 	RecommendedPrice string `json:"recommended_price"`
@@ -244,7 +242,7 @@ type ProductDetails struct {
 	Visible bool `json:"visible"`
 
 	// Product volume weight
-	VolumeWeight float64 `json:"volume_weights"`
+	VolumeWeight float64 `json:"volume_weight"`
 }
 
 type ProductDetailCommission struct {
@@ -278,7 +276,7 @@ type ProductDetailPriceIndex struct {
 	PriceIndex string `json:"price_index"`
 
 	// Price of your product on other marketplaces
-	SelfMarketplaceIndexData ProductDetailPriceIndexSelfMarketplace `json:"self_marketplace_index_data"`
+	SelfMarketplaceIndexData ProductDetailPriceIndexSelfMarketplace `json:"self_marketplaces_index_data"`
 }
 
 type ProductDetailPriceIndexExternal struct {
@@ -376,6 +374,8 @@ type ProductDetailStock struct {
 
 type ProductDetailVisibilityDetails struct {
 	// If the product is active, the value is true
+	//
+	// Deprecated: Use `visible` parameter of `ProductDetails`
 	ActiveProduct bool `json:"active_product"`
 
 	// If the price is set, the value is true
@@ -383,6 +383,9 @@ type ProductDetailVisibilityDetails struct {
 
 	// If there is stock at the warehouses, the value is true
 	HasStock bool `json:"has_stock"`
+
+	// Reason why the product is hidden
+	Reasons map[string]interface{} `json:"reasons"`
 }
 
 type ProductDiscountedStocks struct {
@@ -422,12 +425,15 @@ type GetProductDetailsResponseItemError struct {
 }
 
 // Get product details
-func (c Products) GetProductDetails(params *GetProductDetailsParams) (*GetProductDetailsResponse, error) {
+//
+// Check a minimum product price with all promotions applied in your personal account.
+// The min_price parameter from the method response is in development and returns 0
+func (c Products) GetProductDetails(ctx context.Context, params *GetProductDetailsParams) (*GetProductDetailsResponse, error) {
 	url := "/v2/product/info"
 
 	resp := &GetProductDetailsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -487,12 +493,12 @@ type UpdateStocksResultError struct {
 // With one request you can change the availability for 100 products. You can send up to 80 requests in a minute.
 //
 // Availability can only be set after the product status has been changed to processed.
-func (c Products) UpdateStocks(params *UpdateStocksParams) (*UpdateStocksResponse, error) {
+func (c Products) UpdateStocks(ctx context.Context, params *UpdateStocksParams) (*UpdateStocksResponse, error) {
 	url := "/v1/product/import/stocks"
 
 	resp := &UpdateStocksResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -558,15 +564,15 @@ type UpdateQuantityStockProductsResultError struct {
 //
 // You can update the stock of one product in one warehouse only once in 2 minutes, otherwise there will be the TOO_MANY_REQUESTS error in the response.
 //
-// Availability can only be set after the product status has been changed to processed.
+// You can set the availability of an item only after the product status is changed to price_sent
 //
 // Bulky products stock can only be updated in the warehouses for bulky products.
-func (c Products) UpdateQuantityStockProducts(params *UpdateQuantityStockProductsParams) (*UpdateQuantityStockProductsResponse, error) {
+func (c Products) UpdateQuantityStockProducts(ctx context.Context, params *UpdateQuantityStockProductsParams) (*UpdateQuantityStockProductsResponse, error) {
 	url := "/v2/products/stocks"
 
 	resp := &UpdateQuantityStockProductsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -576,12 +582,8 @@ func (c Products) UpdateQuantityStockProducts(params *UpdateQuantityStockProduct
 }
 
 type StocksInSellersWarehouseParams struct {
-	// SKU of the product that is sold from the seller's warehouse (FBS and RFBS schemes).
+	// Product SKU
-	//
+	SKU []string `json:"sku"`
-	// Get fbs_sku in the /v2/product/info and /v2/product/info/list methods response.
-	//
-	// The maximum number of SKUs per request is 500.
-	FBSSKU []string `json:"fbs_sku"`
 }
 
 type StocksInSellersWarehouseResponse struct {
@@ -593,7 +595,7 @@ type StocksInSellersWarehouseResponse struct {
 
 type StocksInSellersWarehouseResult struct {
 	// SKU of the product that is sold from the seller's warehouse (FBS and RFBS schemes)
-	FBSSKU int64 `json:"fbs_sku"`
+	SKU int64 `json:"sku"`
 
 	// Total number of items in the warehouse
 	Present int64 `json:"present"`
@@ -612,12 +614,12 @@ type StocksInSellersWarehouseResult struct {
 }
 
 // Get stocks in seller's warehouse
-func (c Products) StocksInSellersWarehouse(params *StocksInSellersWarehouseParams) (*StocksInSellersWarehouseResponse, error) {
+func (c Products) StocksInSellersWarehouse(ctx context.Context, params *StocksInSellersWarehouseParams) (*StocksInSellersWarehouseResponse, error) {
 	url := "/v1/product/info/stocks-by-warehouse/fbs"
 
 	resp := &StocksInSellersWarehouseResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -647,12 +649,24 @@ type UpdatePricesPrice struct {
 	OfferId string `json:"offer_id"`
 
 	// Price before discounts. Displayed strikethrough on the product description page.
-	// Specified in rubles. The fractional part is separated by decimal point, up to two digits after the decimal point.
+	// Specified in rubles.
+	// The fractional part is separated by decimal point,
+	// up to two digits after the decimal point.
+	//
+	// If there are no discounts on the product, pass 0 to this field and specify the correct price in the price field
 	OldPrice string `json:"old_price"`
 
 	// Product price including discounts. This value is displayed on the product description page.
 	//
-	// If the current price of the product is from 400 to 10 000 rubles inclusive, the difference between the values of price and old_price fields should be more than 5%, but not less than 20 rubles.
+	// If the old_price parameter value is greater than 0,
+	// there should be a certain difference between price and old_price.
+	// It depends on the price value
+	//
+	// < 400 - min diff. 20 rubles
+	//
+	// 400-10,000 - min diff. 5%
+	//
+	// > 10,000 - min diff. 500 rubles
 	Price string `json:"price"`
 
 	// Attribute for enabling and disabling pricing strategies auto-application
@@ -698,12 +712,12 @@ type UpdatePricesResultError struct {
 // To reset old_price or premium_price set these parameters to 0.
 //
 // A new price must differ from the old one by at least 5%.
-func (c Products) UpdatePrices(params *UpdatePricesParams) (*UpdatePricesResponse, error) {
+func (c Products) UpdatePrices(ctx context.Context, params *UpdatePricesParams) (*UpdatePricesResponse, error) {
 	url := "/v1/product/import/prices"
 
 	resp := &UpdatePricesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -727,7 +741,7 @@ type CreateOrUpdateProductItem struct {
 	Barcode string `json:"barcode"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Marketing color.
 	//
@@ -873,12 +887,12 @@ type CreateOrUpdateProductResult struct {
 }
 
 // This method allows you to create products and update their details
-func (c Products) CreateOrUpdateProduct(params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
+func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
 	url := "/v2/product/import"
 
 	resp := &CreateOrUpdateProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -939,12 +953,12 @@ type GetListOfProductsResultItem struct {
 	ProductId int64 `json:"product_id"`
 }
 
-func (c Products) GetListOfProducts(params *GetListOfProductsParams) (*GetListOfProductsResponse, error) {
+func (c Products) GetListOfProducts(ctx context.Context, params *GetListOfProductsParams) (*GetListOfProductsResponse, error) {
 	url := "/v2/product/list"
 
 	resp := &GetListOfProductsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1022,12 +1036,12 @@ type GetProductsRatingBySKUProductGroupImproveAttr struct {
 }
 
 // Method for getting products' content rating and recommendations on how to increase it
-func (c Products) GetProductsRatingBySKU(params *GetProductsRatingBySKUParams) (*GetProductsRatingBySKUResponse, error) {
+func (c Products) GetProductsRatingBySKU(ctx context.Context, params *GetProductsRatingBySKUParams) (*GetProductsRatingBySKUResponse, error) {
 	url := "/v1/product/rating-by-sku"
 
 	resp := &GetProductsRatingBySKUResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1083,12 +1097,12 @@ type GetProductImportStatusResultItemError struct {
 }
 
 // Allows you to get the status of a product description page creation process
-func (c Products) GetProductImportStatus(params *GetProductImportStatusParams) (*GetProductImportStatusResponse, error) {
+func (c Products) GetProductImportStatus(ctx context.Context, params *GetProductImportStatusParams) (*GetProductImportStatusResponse, error) {
 	url := "/v1/product/import/info"
 
 	resp := &GetProductImportStatusResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1141,6 +1155,10 @@ type CreateProductsByOzonIDItem struct {
 type CreateProductByOzonIDResponse struct {
 	core.CommonResponse
 
+	Result CreateProductByOzonIDResult `json:"result"`
+}
+
+type CreateProductByOzonIDResult struct {
 	// Products import task code
 	TaskId int64 `json:"task_id"`
 
@@ -1151,12 +1169,12 @@ type CreateProductByOzonIDResponse struct {
 // Creates a product by the specified Ozon ID. The number of products is unlimited.
 //
 // It's not possible to update products using Ozon ID
-func (c Products) CreateProductByOzonID(params *CreateProductByOzonIDParams) (*CreateProductByOzonIDResponse, error) {
+func (c Products) CreateProductByOzonID(ctx context.Context, params *CreateProductByOzonIDParams) (*CreateProductByOzonIDResponse, error) {
 	url := "/v1/product/import-by-sku"
 
 	resp := &CreateProductByOzonIDResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1240,12 +1258,12 @@ type ProductInfoResultPicture struct {
 // first get the details using `/v2/product/info` or `/v2/product/info/list` methods.
 // Using them you can get the current list of images and their order.
 // Copy the data from the images, images360, and color_image fields and make the necessary changes to it
-func (c Products) UpdateProductImages(params *UpdateProductImagesParams) (*ProductInfoResponse, error) {
+func (c Products) UpdateProductImages(ctx context.Context, params *UpdateProductImagesParams) (*ProductInfoResponse, error) {
 	url := "/v1/product/pictures/import"
 
 	resp := &ProductInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1260,12 +1278,12 @@ type CheckImageUploadingStatusParams struct {
 }
 
 // Check products images uploading status
-func (c Products) CheckImageUploadingStatus(params *CheckImageUploadingStatusParams) (*ProductInfoResponse, error) {
+func (c Products) CheckImageUploadingStatus(ctx context.Context, params *CheckImageUploadingStatusParams) (*ProductInfoResponse, error) {
 	url := "/v1/product/pictures/info"
 
 	resp := &ProductInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1302,12 +1320,12 @@ type ListProductsByIDsResult struct {
 // The request body must contain an array of identifiers of the same type. The response will contain an items array.
 //
 // For each shipment in the items array the fields match the ones recieved in the /v2/product/info method
-func (c Products) ListProductsByIDs(params *ListProductsByIDsParams) (*ListProductsByIDsResponse, error) {
+func (c Products) ListProductsByIDs(ctx context.Context, params *ListProductsByIDsParams) (*ListProductsByIDsResponse, error) {
 	url := "/v2/product/info/list"
 
 	resp := &ListProductsByIDsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1369,7 +1387,7 @@ type GetDescriptionOfProductResult struct {
 	Barcode string `json:"barcode"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Marketing color
 	ColorImage string `json:"color_image"`
@@ -1490,12 +1508,12 @@ type GetDescriptionOfProductResultPDF struct {
 }
 
 // Returns a product characteristics description by product identifier. You can search for the product by `offer_id` or `product_id`
-func (c Products) GetDescriptionOfProduct(params *GetDescriptionOfProductParams) (*GetDescriptionOfProductResponse, error) {
+func (c Products) GetDescriptionOfProduct(ctx context.Context, params *GetDescriptionOfProductParams) (*GetDescriptionOfProductResponse, error) {
 	url := "/v3/products/info/attributes"
 
 	resp := &GetDescriptionOfProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1534,12 +1552,12 @@ type GetProductDescriptionResult struct {
 }
 
 // Get product description
-func (c Products) GetProductDescription(params *GetProductDescriptionParams) (*GetProductDescriptionResponse, error) {
+func (c Products) GetProductDescription(ctx context.Context, params *GetProductDescriptionParams) (*GetProductDescriptionResponse, error) {
 	url := "/v1/product/info/description"
 
 	resp := &GetProductDescriptionResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1586,12 +1604,12 @@ type GetProductRangeLimitUploadQuota struct {
 //   - Products update limit: how many products you can update per day.
 //
 // If you have a product range limit and you exceed it, you won't be able to create new products
-func (c Products) GetProductRangeLimit() (*GetProductRangeLimitResponse, error) {
+func (c Products) GetProductRangeLimit(ctx context.Context) (*GetProductRangeLimitResponse, error) {
 	url := "/v4/product/info/limit"
 
 	resp := &GetProductRangeLimitResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, &struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, &struct{}{}, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1633,12 +1651,12 @@ type ChangeProductIDsError struct {
 // Method for changing the offer_id linked to products. You can change multiple offer_id in this method.
 //
 // We recommend transmitting up to 250 values in an array
-func (c Products) ChangeProductIDs(params *ChangeProductIDsParams) (*ChangeProductIDsResponse, error) {
+func (c Products) ChangeProductIDs(ctx context.Context, params *ChangeProductIDsParams) (*ChangeProductIDsResponse, error) {
 	url := "/v1/product/update/offer-id"
 
 	resp := &ChangeProductIDsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1660,12 +1678,12 @@ type ArchiveProductResponse struct {
 }
 
 // Archive product
-func (c Products) ArchiveProduct(params *ArchiveProductParams) (*ArchiveProductResponse, error) {
+func (c Products) ArchiveProduct(ctx context.Context, params *ArchiveProductParams) (*ArchiveProductResponse, error) {
 	url := "/v1/product/archive"
 
 	resp := &ArchiveProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1677,12 +1695,12 @@ func (c Products) ArchiveProduct(params *ArchiveProductParams) (*ArchiveProductR
 // Warning: Since June 14, 2023 the method is disabled.
 //
 // Unarchive product
-func (c Products) UnarchiveProduct(params *ArchiveProductParams) (*ArchiveProductResponse, error) {
+func (c Products) UnarchiveProduct(ctx context.Context, params *ArchiveProductParams) (*ArchiveProductResponse, error) {
 	url := "/v1/product/unarchive"
 
 	resp := &ArchiveProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1722,12 +1740,12 @@ type RemoveProductWithoutSKUStatus struct {
 // Remove a product without an SKU from the archive
 //
 // You can pass up to 500 identifiers in one request
-func (c Products) RemoveProductWithoutSKU(params *RemoveProductWithoutSKUParams) (*RemoveProductWithoutSKUResponse, error) {
+func (c Products) RemoveProductWithoutSKU(ctx context.Context, params *RemoveProductWithoutSKUParams) (*RemoveProductWithoutSKUResponse, error) {
 	url := "/v2/products/delete"
 
 	resp := &RemoveProductWithoutSKUResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1783,12 +1801,12 @@ type ListGeoRestrictionsRestriction struct {
 }
 
 // Get a list of geo-restrictions for services
-func (c Products) ListGeoRestrictions(params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) {
+func (c Products) ListGeoRestrictions(ctx context.Context, params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) {
 	url := "/v1/products/geo-restrictions-catalog-by-filter"
 
 	resp := &ListGeoRestrictionsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1818,12 +1836,12 @@ type UploadActivationCodesResult struct {
 }
 
 // Upload activation codes when you upload service or digital products. Activation code is associated with the digital product card
-func (c Products) UploadActivationCodes(params *UploadActivationCodesParams) (*UploadActivationCodesResponse, error) {
+func (c Products) UploadActivationCodes(ctx context.Context, params *UploadActivationCodesParams) (*UploadActivationCodesResponse, error) {
 	url := "/v1/product/upload_digital_codes"
 
 	resp := &UploadActivationCodesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1853,12 +1871,12 @@ type StatusOfUploadingActivationCodesResult struct {
 }
 
 // Get status of uploading activation codes task for services and digital products
-func (c Products) StatusOfUploadingActivationCodes(params *StatusOfUploadingActivationCodesParams) (*StatusOfUploadingActivationCodesResponse, error) {
+func (c Products) StatusOfUploadingActivationCodes(ctx context.Context, params *StatusOfUploadingActivationCodesParams) (*StatusOfUploadingActivationCodesResponse, error) {
 	url := "/v1/product/upload_digital_codes/info"
 
 	resp := &StatusOfUploadingActivationCodesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1933,7 +1951,7 @@ type GetPRoductPriceInfoResultItem struct {
 	PriceIndex string `json:"price_index"`
 
 	// Product price indexes
-	PriceIndexes GetProductPriceInfoResultItemPriceIndexes `json:"prices_indexes"`
+	PriceIndexes GetProductPriceInfoResultItemPriceIndexes `json:"price_indexes"`
 
 	// Product identifier
 	ProductId int64 `json:"product_id"`
@@ -1977,7 +1995,7 @@ type GetProductPriceInfoResultItemCommission struct {
 	FBSShipmentProcessingToFee float64 `json:"fbs_first_mile_min_amount"`
 
 	// Maximal shipment processing fee (FBS) — 25 rubles
-	FBSShipmentProcessingFromFee float64 `json:"Shipment processing fee from (FBS)"`
+	FBSShipmentProcessingFromFee float64 `json:"fbs_first_mile_max_amount"`
 
 	// Return and cancellation fees, shipment processing (FBS)
 	FBSReturnCancellationProcessingFee float64 `json:"fbs_return_flow_amount"`
@@ -2075,7 +2093,7 @@ type GetProductPriceInfoResultItemPriceIndexes struct {
 	PriceIndex string `json:"price_index"`
 
 	// Price of your product on other marketplaces
-	SelfMarketplaceIndexData GetProductPriceInfoResultItemPriceIndexesSelfMarketplace `json:"self_marketplace_index_data"`
+	SelfMarketplaceIndexData GetProductPriceInfoResultItemPriceIndexesSelfMarketplace `json:"self_marketplaces_index_data"`
 }
 
 type GetProductPriceInfoResultItemPriceIndexesExternal struct {
@@ -2112,12 +2130,16 @@ type GetProductPriceInfoResultItemPriceIndexesSelfMarketplace struct {
 }
 
 // You can specify up to 1000 products in the request
-func (c Products) GetProductPriceInfo(params *GetProductPriceInfoParams) (*GetProductPriceInfoResponse, error) {
+//
+// Check minimum and maximum commissions for FBO pipeline in your personal account.
+// The `fbo_direct_flow_trans_max_amount` and `fbo_direct_flow_trans_min_amount` parameters
+// from the method response are in development and return 0
+func (c Products) GetProductPriceInfo(ctx context.Context, params *GetProductPriceInfoParams) (*GetProductPriceInfoResponse, error) {
 	url := "/v4/product/info/prices"
 
 	resp := &GetProductPriceInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2151,7 +2173,7 @@ type GetMarkdownInfoItem struct {
 	//   - 3 — very good,
 	//   - 4 — excellent,
 	//   - 5–7 — like new
-	ConditionEstimate string `json:"condition_estimate"`
+	ConditionEstimation string `json:"condition_estimation"`
 
 	// Product defects
 	Defects string `json:"defects"`
@@ -2188,12 +2210,12 @@ type GetMarkdownInfoItem struct {
 //
 // A method for getting information about the condition and defects of a markdown product by its SKU.
 // The method also returns the SKU of the main product
-func (c Products) GetMarkdownInfo(params *GetMarkdownInfoParams) (*GetMarkdownInfoResponse, error) {
+func (c Products) GetMarkdownInfo(ctx context.Context, params *GetMarkdownInfoParams) (*GetMarkdownInfoResponse, error) {
 	url := "/v1/product/info/discounted"
 
 	resp := &GetMarkdownInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2218,12 +2240,12 @@ type SetDiscountOnMarkdownProductResponse struct {
 }
 
 // A method for setting the discount percentage on markdown products sold under the FBS scheme
-func (c Products) SetDiscountOnMarkdownProduct(params *SetDiscountOnMarkdownProductParams) (*SetDiscountOnMarkdownProductResponse, error) {
+func (c Products) SetDiscountOnMarkdownProduct(ctx context.Context, params *SetDiscountOnMarkdownProductParams) (*SetDiscountOnMarkdownProductResponse, error) {
 	url := "/v1/product/update/discount"
 
 	resp := &SetDiscountOnMarkdownProductResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2253,12 +2275,12 @@ type NumberOfSubsToProductAvailabilityResult struct {
 }
 
 // You can pass multiple products in a request
-func (c Products) NumberOfSubsToProductAvailability(params *NumberOfSubsToProductAvailabilityParams) (*NumberOfSubsToProductAvailabilityResponse, error) {
+func (c Products) NumberOfSubsToProductAvailability(ctx context.Context, params *NumberOfSubsToProductAvailabilityParams) (*NumberOfSubsToProductAvailabilityResponse, error) {
 	url := "/v1/product/info/subscription"
 
 	resp := &NumberOfSubsToProductAvailabilityResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2309,12 +2331,73 @@ type UpdateCharacteristicsResponse struct {
 	TaskId int64 `json:"task_id"`
 }
 
-func (c Products) UpdateCharacteristics(params *UpdateCharacteristicsParams) (*UpdateCharacteristicsResponse, error) {
+func (c Products) UpdateCharacteristics(ctx context.Context, params *UpdateCharacteristicsParams) (*UpdateCharacteristicsResponse, error) {
 	url := "/v1/product/attributes/update"
 
 	resp := &UpdateCharacteristicsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetRelatedSKUsParams struct {
+	// List of SKUs
+	SKUs []string `json:"sku"`
+}
+
+type GetRelatedSKUsResponse struct {
+	core.CommonResponse
+
+	// Related SKUs information
+	Items []GetRelatedSKUsItem `json:"items"`
+
+	// Errors
+	Errors []GetRelatedSKUsError `json:"errors"`
+}
+
+type GetRelatedSKUsItem struct {
+	// Product availability attribute by SKU
+	Availability SKUAvailability `json:"availability"`
+
+	// Date and time of deletion
+	DeletedAt time.Time `json:"deleted_at"`
+
+	// Delivery scheme
+	DeliverySchema string `json:"delivery_schema"`
+
+	// Product identifier
+	ProductId int64 `json:"product_id"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+}
+
+type GetRelatedSKUsError struct {
+	// Error code
+	Code string `json:"code"`
+
+	// SKU, in which the error occurred
+	SKU int `json:"sku"`
+
+	// Error text
+	Message string `json:"message"`
+}
+
+// You can pass any SKU in the request, even a deleted one.
+// The response will contain all SKUs related to the passed ones.
+//
+// In one request, you can pass up to 200 SKUs.
+func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsParams) (*GetRelatedSKUsResponse, error) {
+	url := "/v1/product/related-sku/get"
+
+	resp := &GetRelatedSKUsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/products_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"testing"
@@ -70,11 +71,15 @@ func TestGetStocksInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetStocksInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetStocksInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetStocksInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -122,7 +127,7 @@ func TestGetProductDetails(t *testing.T) {
 					"7533900005"
 				  ],
 				  "buybox_price": "",
-				  "category_id": 17038062,
+				  "description_category_id": 17038062,
 				  "created_at": "2021-10-21T15:48:03.529178Z",
 				  "images": [
 					"https://cdn1.ozone.ru/s3/multimedia-5/6088931525.jpg",
@@ -159,7 +164,6 @@ func TestGetProductDetails(t *testing.T) {
 					"present": 0,
 					"reserved": 0
 				  },
-				  "errors": [],
 				  "updated_at": "2023-02-09T06:46:44.152Z",
 				  "vat": "0.0",
 				  "visible": false,
@@ -267,11 +271,15 @@ func TestGetProductDetails(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductDetails(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductDetails(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductDetailsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -283,7 +291,7 @@ func TestGetProductDetails(t *testing.T) {
 			if resp.Result.OfferId == "" {
 				t.Errorf("Offer id cannot be empty")
 			}
-			if resp.Result.CategoryId == 0 {
+			if resp.Result.DescriptionCategoryId == 0 {
 				t.Errorf("Category id cannot be 0")
 			}
 			if resp.Result.CurrencyCode == "" {
@@ -341,11 +349,15 @@ func TestUpdateStocks(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UpdateStocks(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UpdateStocks(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UpdateStocksResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -380,12 +392,12 @@ func TestStocksInSellersWarehouse(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&StocksInSellersWarehouseParams{
-				FBSSKU: []string{"123"},
+				SKU: []string{"123"},
 			},
 			`{
 				"result": [
 				  {
-					"fbs_sku": 12,
+					"sku": 12,
 					"present": 34,
 					"product_id": 548761,
 					"reserved": 5,
@@ -410,21 +422,25 @@ func TestStocksInSellersWarehouse(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().StocksInSellersWarehouse(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().StocksInSellersWarehouse(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &StocksInSellersWarehouseResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
 
 		if resp.StatusCode == http.StatusOK {
-			if len(resp.Result) != len(test.params.FBSSKU) {
+			if len(resp.Result) != len(test.params.SKU) {
 				t.Errorf("Length of skus in request and response must be equal")
 			}
 			if len(resp.Result) > 0 {
-				if fmt.Sprint(resp.Result[0].FBSSKU) == test.params.FBSSKU[0] {
+				if fmt.Sprint(resp.Result[0].SKU) == test.params.SKU[0] {
 					t.Errorf("fbs sku in request and response are not equal")
 				}
 			}
@@ -484,11 +500,15 @@ func TestUpdatePrices(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UpdatePrices(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UpdatePrices(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UpdatePricesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -556,11 +576,15 @@ func TestUpdateQuantityStockProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UpdateQuantityStockProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UpdateQuantityStockProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UpdateQuantityStockProductsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -651,21 +675,21 @@ func TestCreateOrUpdateProduct(t *testing.T) {
 								},
 							},
 						},
-						Barcode:       "112772873170",
+						Barcode:               "112772873170",
-						CategoryId:    17033876,
+						DescriptionCategoryId: 17033876,
-						CurrencyCode:  "RUB",
+						CurrencyCode:          "RUB",
-						Depth:         10,
+						Depth:                 10,
-						DimensionUnit: "mm",
+						DimensionUnit:         "mm",
-						Height:        250,
+						Height:                250,
-						Name:          "Комплект защитных плёнок для X3 NFC. Темный хлопок",
+						Name:                  "Комплект защитных плёнок для X3 NFC. Темный хлопок",
-						OfferId:       "143210608",
+						OfferId:               "143210608",
-						OldPrice:      "1100",
+						OldPrice:              "1100",
-						PremiumPrice:  "900",
+						PremiumPrice:          "900",
-						Price:         "1000",
+						Price:                 "1000",
-						VAT:           "0.1",
+						VAT:                   "0.1",
-						Weight:        100,
+						Weight:                100,
-						WeightUnit:    "g",
+						WeightUnit:            "g",
-						Width:         150,
+						Width:                 150,
 					},
 				},
 			},
@@ -690,11 +714,15 @@ func TestCreateOrUpdateProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().CreateOrUpdateProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().CreateOrUpdateProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateOrUpdateProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -757,11 +785,15 @@ func TestGetListOfProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetListOfProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetListOfProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetListOfProductsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1003,11 +1035,15 @@ func TestGetProductsRatingBySKU(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductsRatingBySKU(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductsRatingBySKU(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductsRatingBySKUResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1070,11 +1106,15 @@ func TestGetProductImportStatus(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductImportStatus(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductImportStatus(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductImportStatusResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1141,11 +1181,15 @@ func TestCreateProductByOzonID(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().CreateProductByOzonID(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().CreateProductByOzonID(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateProductByOzonIDResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1209,11 +1253,15 @@ func TestUpdateProductImages(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UpdateProductImages(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UpdateProductImages(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1277,11 +1325,15 @@ func TestCheckImageUploadingStatus(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().CheckImageUploadingStatus(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().CheckImageUploadingStatus(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1325,7 +1377,7 @@ func TestListProductsByIDs(t *testing.T) {
 						"7533900005"
 					  ],
 					  "buybox_price": "",
-					  "category_id": 93726157,
+					  "description_category_id": 93726157,
 					  "created_at": "2021-06-03T03:40:05.871465Z",
 					  "images": [],
 					  "has_discounted_item": true,
@@ -1354,13 +1406,11 @@ func TestListProductsByIDs(t *testing.T) {
 						  "source": "fbs"
 						}
 					  ],
-					  "state": "",
 					  "stocks": {
 						"coming": 0,
 						"present": 13,
 						"reserved": 0
 					  },
-					  "errors": [],
 					  "updated_at": "2023-02-09T06:46:44.152Z",
 					  "vat": "0.0",
 					  "visible": true,
@@ -1396,7 +1446,6 @@ func TestListProductsByIDs(t *testing.T) {
 					  "offer_id": "23",
 					  "barcode": "",
 					  "buybox_price": "",
-					  "category_id": 90635895,
 					  "created_at": "2021-05-26T20:26:07.565586Z",
 					  "images": [],
 					  "marketing_price": "",
@@ -1417,13 +1466,11 @@ func TestListProductsByIDs(t *testing.T) {
 						  "source": "fbs"
 						}
 					  ],
-					  "state": "",
 					  "stocks": {
 						"coming": 0,
 						"present": 19,
 						"reserved": 0
 					  },
-					  "errors": [],
 					  "updated_at": "2023-02-09T06:46:44.152Z",
 					  "vat": "0.0",
 					  "visible": true,
@@ -1472,11 +1519,15 @@ func TestListProductsByIDs(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().ListProductsByIDs(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().ListProductsByIDs(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListProductsByIDsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1521,7 +1572,7 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 				  {
 					"id": 213761435,
 					"barcode": "",
-					"category_id": 17038062,
+					"description_category_id": 17038062,
 					"name": "Пленка защитная для Xiaomi Redmi Note 10 Pro 5G",
 					"offer_id": "21470",
 					"height": 10,
@@ -1683,8 +1734,7 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 					  }
 					],
 					"complex_attributes": [],
-					"color_image": "",
+					"color_image": ""
-					"last_id": ""
 				  }
 				],
 				"total": 1,
@@ -1706,11 +1756,15 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetDescriptionOfProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetDescriptionOfProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetDescriptionOfProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1764,11 +1818,15 @@ func TestGetProductDescription(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductDescription(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductDescription(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductDescriptionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1827,11 +1885,15 @@ func TestGetProductRangeLimit(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductRangeLimit()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductRangeLimit(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductRangeLimitResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1883,11 +1945,15 @@ func TestChangeProductIDs(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().ChangeProductIDs(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().ChangeProductIDs(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ChangeProductIDsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1929,11 +1995,15 @@ func TestArchiveProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().ArchiveProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().ArchiveProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ArchiveProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -1975,11 +2045,15 @@ func TestUnarchiveProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UnarchiveProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UnarchiveProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ArchiveProductResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2031,11 +2105,15 @@ func TestRemoveProductWithoutSKU(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().RemoveProductWithoutSKU(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().RemoveProductWithoutSKU(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &RemoveProductWithoutSKUResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2108,11 +2186,15 @@ func TestListGeoRestrictions(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().ListGeoRestrictions(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().ListGeoRestrictions(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListGeoRestrictionsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2157,11 +2239,15 @@ func TestUploadActivationCodes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UploadActivationCodes(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UploadActivationCodes(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UploadActivationCodesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2205,11 +2291,15 @@ func TestStatusOfUploadingActivationCodes(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().StatusOfUploadingActivationCodes(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().StatusOfUploadingActivationCodes(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &StatusOfUploadingActivationCodesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2318,11 +2408,15 @@ func TestGetProductPriceInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetProductPriceInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetProductPriceInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetProductPriceInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -2380,9 +2474,11 @@ func TestGetMarkdownInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().GetMarkdownInfo(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetMarkdownInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -2390,6 +2486,8 @@ func TestGetMarkdownInfo(t *testing.T) {
 		}
 
 		if resp.StatusCode == http.StatusOK {
+			compareJsonResponse(t, test.response, &GetMarkdownInfoResponse{})
+
 			if len(resp.Items) > 0 {
 				if fmt.Sprint(resp.Items[0].DiscountedSKU) != test.params.DiscountedSKUs[0] {
 					t.Errorf("SKUs in reqest and resonse are not equal")
@@ -2435,14 +2533,18 @@ func TestSetDiscountOnMarkdownProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().SetDiscountOnMarkdownProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().SetDiscountOnMarkdownProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
+
+		compareJsonResponse(t, test.response, &SetDiscountOnMarkdownProductResponse{})
 	}
 }
 
@@ -2486,15 +2588,19 @@ func TestNumberOfSubsToProductAvailability(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().NumberOfSubsToProductAvailability(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().NumberOfSubsToProductAvailability(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
 
+		compareJsonResponse(t, test.response, &NumberOfSubsToProductAvailabilityResponse{})
+
 		if resp.StatusCode == http.StatusOK {
 			if len(resp.Result) != len(test.params.SKUS) {
 				t.Errorf("Length of SKUS in request and response are not equal")
@@ -2560,13 +2666,86 @@ func TestUpdateCharacteristics(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Products().UpdateCharacteristics(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().UpdateCharacteristics(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
+
+		compareJsonResponse(t, test.response, &UpdateCharacteristicsResponse{})
+	}
+}
+
+func TestGetRelatedSKUs(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetRelatedSKUsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetRelatedSKUsParams{
+				SKUs: []string{"321", "322"},
+			},
+			`{
+				"items": [
+				  {
+					"availability": "HIDDEN",
+					"deleted_at": "2019-08-24T14:15:22Z",
+					"delivery_schema": "fbs",
+					"product_id": 123,
+					"sku": 321
+				  }
+				],
+				"errors": [
+				  {
+					"code": "test_code",
+					"sku": 322,
+					"message": "test_message"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetRelatedSKUsParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Products().GetRelatedSKUs(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		compareJsonResponse(t, test.response, &GetRelatedSKUsResponse{})
+
+		if len(resp.Errors)+len(resp.Items) != len(test.params.SKUs) {
+			t.Errorf("expected equal length of skus in request and response")
+		}
 	}
 }

ozon/promotions.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -51,7 +52,7 @@ type GetAvailablePromotionsResult struct {
 	ParticipatingProductsCount float64 `json:"participating_products_count"`
 
 	// Whether or not you participate in the promotion
-	IsParticipating bool `json:"participating"`
+	IsParticipating bool `json:"is_participating"`
 
 	// Indication that customers need a promo code to participate in the promotion
 	IsVoucherAction bool `json:"is_voucher_action"`
@@ -73,12 +74,12 @@ type GetAvailablePromotionsResult struct {
 }
 
 // A method for getting a list of promotions that you can participate in
-func (c Promotions) GetAvailablePromotions() (*GetAvailablePromotionsResponse, error) {
+func (c Promotions) GetAvailablePromotions(ctx context.Context) (*GetAvailablePromotionsResponse, error) {
 	url := "/v1/actions"
 
 	resp := &GetAvailablePromotionsResponse{}
 
-	response, err := c.client.Request(http.MethodGet, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -130,12 +131,12 @@ type AddProductToPromotionResultRejected struct {
 }
 
 // A method for adding products to an available promotion
-func (c Promotions) AddToPromotion(params *AddProductToPromotionParams) (*AddProductToPromotionResponse, error) {
+func (c Promotions) AddToPromotion(ctx context.Context, params *AddProductToPromotionParams) (*AddProductToPromotionResponse, error) {
 	url := "/v1/actions/products/activate"
 
 	resp := &AddProductToPromotionResponse{}
 
-	response, err := c.client.Request(http.MethodGet, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +183,7 @@ type PromotionProduct struct {
 	ActionPrice float64 `json:"action_price"`
 
 	// Maximum possible promotional product price
-	MaxActionType float64 `json:"max_action_type"`
+	MaxActionPrice float64 `json:"max_action_price"`
 
 	// Type of adding a product to the promotion: automatically or manually by the seller
 	AddMode string `json:"add_mode"`
@@ -195,12 +196,12 @@ type PromotionProduct struct {
 }
 
 // A method for getting a list of products that can participate in the promotion by the promotion identifier
-func (c Promotions) ProductsAvailableForPromotion(params *ProductsAvailableForPromotionParams) (*ProductsAvailableForPromotionResponse, error) {
+func (c Promotions) ProductsAvailableForPromotion(ctx context.Context, params *ProductsAvailableForPromotionParams) (*ProductsAvailableForPromotionResponse, error) {
 	url := "/v1/actions/candidates"
 
 	resp := &ProductsAvailableForPromotionResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -224,7 +225,7 @@ type ProductsInPromotionResponse struct {
 	core.CommonResponse
 
 	// Method result
-	Result ProductsInPromotionResult `json:"reuslt"`
+	Result ProductsInPromotionResult `json:"result"`
 }
 
 type ProductsInPromotionResult struct {
@@ -236,12 +237,12 @@ type ProductsInPromotionResult struct {
 }
 
 // A method for getting the list of products participating in the promotion by its identifier
-func (c Promotions) ProductsInPromotion(params *ProductsInPromotionParams) (*ProductsInPromotionResponse, error) {
+func (c Promotions) ProductsInPromotion(ctx context.Context, params *ProductsInPromotionParams) (*ProductsInPromotionResponse, error) {
 	url := "/v1/actions/products"
 
 	resp := &ProductsInPromotionResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -282,12 +283,12 @@ type RemoveProductFromPromotionResultRejected struct {
 }
 
 // A method for removing products from the promotion
-func (c Promotions) RemoveProduct(params *RemoveProductFromPromotionParams) (*RemoveProductFromPromotionResponse, error) {
+func (c Promotions) RemoveProduct(ctx context.Context, params *RemoveProductFromPromotionParams) (*RemoveProductFromPromotionResponse, error) {
 	url := "/v1/actions/products/deactivate"
 
 	resp := &RemoveProductFromPromotionResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -332,12 +333,12 @@ type ListHotSalePromotionsResult struct {
 }
 
 // List of available Hot Sale promotions
-func (c Promotions) ListHotSalePromotions() (*ListHotSalePromotionsResponse, error) {
+func (c Promotions) ListHotSalePromotions(ctx context.Context) (*ListHotSalePromotionsResponse, error) {
 	url := "/v1/actions/hotsales/list"
 
 	resp := &ListHotSalePromotionsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -386,7 +387,7 @@ type ProductsAvailableForHotSalePromotionResultProduct struct {
 	IsActive bool `json:"is_active"`
 
 	// Maximum possible promotional price of the product
-	MaxActionPrice float64 `json:"max_action_type"`
+	MaxActionPrice float64 `json:"max_action_price"`
 
 	// Minimum number of product units in a stock discount type promotion
 	MinStock float64 `json:"min_stock"`
@@ -396,12 +397,12 @@ type ProductsAvailableForHotSalePromotionResultProduct struct {
 }
 
 // Method for getting a list of products that can participate or are already participating in the Hot Sale promotion
-func (c Promotions) ProductsAvailableForHotSalePromotion(params *ProductsAvailableForHotSalePromotionParams) (*ProductsAvailableForHotSalePromotionResponse, error) {
+func (c Promotions) ProductsAvailableForHotSalePromotion(ctx context.Context, params *ProductsAvailableForHotSalePromotionParams) (*ProductsAvailableForHotSalePromotionResponse, error) {
 	url := "/v1/actions/hotsales/products"
 
 	resp := &ProductsAvailableForHotSalePromotionResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -449,12 +450,12 @@ type ProductsToHotSaleResultRejected struct {
 	Reason string `json:"reason"`
 }
 
-func (c Promotions) AddProductsToHotSale(params *AddProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
+func (c Promotions) AddProductsToHotSale(ctx context.Context, params *AddProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
 	url := "/v1/actions/hotsales/activate"
 
 	resp := &ProductsToHotSaleResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -472,12 +473,12 @@ type RemoveProductsToHotSaleParams struct {
 }
 
 // Remove product from the Hot Sale promotion
-func (c Promotions) RemoveProductsToHotSale(params *RemoveProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
+func (c Promotions) RemoveProductsToHotSale(ctx context.Context, params *RemoveProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
 	url := "/v1/actions/hotsales/activate"
 
 	resp := &ProductsToHotSaleResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -612,12 +613,12 @@ type ListDiscountRequestsResult struct {
 }
 
 // Method for getting a list of products that customers want to buy with discount
-func (c Promotions) ListDiscountRequests(params *ListDiscountRequestsParams) (*ListDiscountRequestsResponse, error) {
+func (c Promotions) ListDiscountRequests(ctx context.Context, params *ListDiscountRequestsParams) (*ListDiscountRequestsResponse, error) {
 	url := "/v1/actions/discounts-task/list"
 
 	resp := &ListDiscountRequestsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -677,12 +678,12 @@ type DiscountRequestResultFailDetail struct {
 // You can approve applications in statuses:
 //   - NEW — new
 //   - SEEN — viewed
-func (c Promotions) ApproveDiscountRequest(params *DiscountRequestParams) (*DiscountRequestResponse, error) {
+func (c Promotions) ApproveDiscountRequest(ctx context.Context, params *DiscountRequestParams) (*DiscountRequestResponse, error) {
 	url := "/v1/actions/discounts-task/approve"
 
 	resp := &DiscountRequestResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -694,12 +695,12 @@ func (c Promotions) ApproveDiscountRequest(params *DiscountRequestParams) (*Disc
 // You can decline applications in statuses:
 //   - NEW—new
 //   - SEEN—viewed
-func (c Promotions) DeclineDiscountRequest(params *DiscountRequestParams) (*DiscountRequestResponse, error) {
+func (c Promotions) DeclineDiscountRequest(ctx context.Context, params *DiscountRequestParams) (*DiscountRequestResponse, error) {
 	url := "/v1/actions/discounts-task/decline"
 
 	resp := &DiscountRequestResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/promotions_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -56,11 +57,15 @@ func TestGetAvailablePromotions(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().GetAvailablePromotions()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().GetAvailablePromotions(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetAvailablePromotionsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -125,11 +130,15 @@ func TestAddToPromotion(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().AddToPromotion(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().AddToPromotion(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AddProductToPromotionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -201,11 +210,15 @@ func TestProductsAvailableForPromotion(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ProductsAvailableForPromotion(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ProductsAvailableForPromotion(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductsAvailableForPromotionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -262,11 +275,15 @@ func TestProductsInPromotion(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ProductsInPromotion(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ProductsInPromotion(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductsInPromotionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -314,11 +331,15 @@ func TestRemoveProduct(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().RemoveProduct(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().RemoveProduct(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &RemoveProductFromPromotionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -373,11 +394,15 @@ func TestListHotSalePromotions(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ListHotSalePromotions()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ListHotSalePromotions(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListHotSalePromotionsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -434,11 +459,15 @@ func TestProductsAvailableForHotSalePromotion(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ProductsAvailableForHotSalePromotion(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ProductsAvailableForHotSalePromotion(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductsAvailableForHotSalePromotionResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -494,11 +523,15 @@ func TestAddProductsToHotSale(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().AddProductsToHotSale(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().AddProductsToHotSale(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductsToHotSaleResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -548,11 +581,15 @@ func TestRemoveProductsToHotSale(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().RemoveProductsToHotSale(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().RemoveProductsToHotSale(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ProductsToHotSaleResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -634,11 +671,15 @@ func TestListDiscountRequests(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ListDiscountRequests(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ListDiscountRequests(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListDiscountRequestsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -661,9 +702,9 @@ func TestApproveDiscountRequest(t *testing.T) {
 			&DiscountRequestParams{
 				Tasks: []DiscountRequestTask{
 					{
-						Id: 123,
+						Id:                  123,
-						ApprovedPrice: 11,
+						ApprovedPrice:       11,
-						SellerComment: "string",
+						SellerComment:       "string",
 						ApprovedQuantityMin: 1,
 						ApprovedQuantityMax: 2,
 					},
@@ -697,11 +738,15 @@ func TestApproveDiscountRequest(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().ApproveDiscountRequest(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().ApproveDiscountRequest(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DiscountRequestResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -724,9 +769,9 @@ func TestDeclineDiscountRequest(t *testing.T) {
 			&DiscountRequestParams{
 				Tasks: []DiscountRequestTask{
 					{
-						Id: 123,
+						Id:                  123,
-						ApprovedPrice: 11,
+						ApprovedPrice:       11,
-						SellerComment: "string",
+						SellerComment:       "string",
 						ApprovedQuantityMin: 1,
 						ApprovedQuantityMax: 2,
 					},
@@ -760,11 +805,15 @@ func TestDeclineDiscountRequest(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Promotions().DeclineDiscountRequest(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Promotions().DeclineDiscountRequest(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &DiscountRequestResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/rating.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -16,6 +17,12 @@ type GetCurrentSellerRatingInfoResponse struct {
 
 	// Rating groups list
 	Groups []GetCurrentSellerRatingInfoGroup `json:"groups"`
+
+	// An indication that the penalty points balance is exceeded
+	PenaltyScoreExceeded bool `json:"penalty_score_exceeded"`
+
+	// An indication that you participate in the Premium program
+	Premium bool `json:"premium"`
 }
 
 type GetCurrentSellerRatingInfoGroup struct {
@@ -24,12 +31,6 @@ type GetCurrentSellerRatingInfoGroup struct {
 
 	// Ratings list
 	Items []GetCurrentSellerRatingInfoGroupItem `json:"items"`
-
-	// An indication that the penalty points balance is exceeded
-	PenaltyScoreExceeded bool `json:"penalty_score_exceeded"`
-
-	// An indication that you participate in the Premium program
-	Premium bool `json:"premium"`
 }
 
 type GetCurrentSellerRatingInfoGroupItem struct {
@@ -90,12 +91,12 @@ type GetCurrentSellerRatingInfoGroupItemChange struct {
 	Meaning string `json:"meaning"`
 }
 
-func (c Rating) GetCurrentSellerRatingInfo() (*GetCurrentSellerRatingInfoResponse, error) {
+func (c Rating) GetCurrentSellerRatingInfo(ctx context.Context) (*GetCurrentSellerRatingInfoResponse, error) {
 	url := "/v1/rating/summary"
 
 	resp := &GetCurrentSellerRatingInfoResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -189,12 +190,12 @@ type GetSellerRatingInfoPeriodRatingValueStatus struct {
 	Warning bool `json:"warning"`
 }
 
-func (c Rating) GetSellerRatingInfoForPeriod(params *GetSellerRatingInfoForPeriodParams) (*GetSellerRatingInfoPeriodResponse, error) {
+func (c Rating) GetSellerRatingInfoForPeriod(ctx context.Context, params *GetSellerRatingInfoForPeriodParams) (*GetSellerRatingInfoPeriodResponse, error) {
 	url := "/v1/rating/history"
 
 	resp := &GetSellerRatingInfoPeriodResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/rating_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -58,11 +59,15 @@ func TestGetCurrentRatingInfo(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Rating().GetCurrentSellerRatingInfo()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Rating().GetCurrentSellerRatingInfo(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetCurrentSellerRatingInfoResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -146,11 +151,15 @@ func TestGetRatingInfoForPeriod(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Rating().GetSellerRatingInfoForPeriod(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Rating().GetSellerRatingInfoForPeriod(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetSellerRatingInfoPeriodResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/reports.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -60,6 +61,9 @@ type GetReportsListResultReport struct {
 	Error string `json:"error"`
 
 	// Link to CSV file
+	//
+	// For a report with the SELLER_RETURNS type,
+	// the link is available within 5 minutes after making a request.
 	File string `json:"file"`
 
 	// Array with the filters specified when the seller created the report
@@ -83,12 +87,12 @@ type GetReportsListResultReport struct {
 }
 
 // Returns the list of reports that have been generated before
-func (c Reports) GetList(params *GetReportsListParams) (*GetReportsListResponse, error) {
+func (c Reports) GetList(ctx context.Context, params *GetReportsListParams) (*GetReportsListResponse, error) {
 	url := "/v1/report/list"
 
 	resp := &GetReportsListResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -125,30 +129,20 @@ type GetReportDetailResult struct {
 	// Array with the filters specified when the seller created the report
 	Params map[string]string `json:"params"`
 
-	// Report type:
+	// Report type
-	//   - SELLER_PRODUCTS — products report,
+	ReportType ReportType `json:"report_type"`
-	//   - SELLER_TRANSACTIONS — transactions report,
-	//   - SELLER_PRODUCT_PRICES — product prices report,
-	//   - SELLER_STOCK — stocks report,
-	//   - SELLER_PRODUCT_MOVEMENT — products movement report,
-	//   - SELLER_RETURNS — returns report,
-	//   - SELLER_POSTINGS — shipments report,
-	//   - SELLER_FINANCE — financial report
-	ReportType string `json:"report_type"`
 
-	// Report generation status:
+	// Report generation status
-	//   - success
+	Status ReportInfoStatus `json:"status"`
-	//   - failed
-	Status string `json:"status"`
 }
 
 // Returns information about a created report by its identifier
-func (c Reports) GetReportDetails(params *GetReportDetailsParams) (*GetReportDetailsResponse, error) {
+func (c Reports) GetReportDetails(ctx context.Context, params *GetReportDetailsParams) (*GetReportDetailsResponse, error) {
 	url := "/v1/report/info"
 
 	resp := &GetReportDetailsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -202,7 +196,7 @@ type GetFinancialResultResultCashflow struct {
 	Period GetFinancialResultResultCashflowPeriod `json:"period"`
 
 	// Sum of sold products prices
-	OrdersAmount float64 `json:"order_amount"`
+	OrdersAmount float64 `json:"orders_amount"`
 
 	// Sum of returned products prices
 	ReturnsAmount float64 `json:"returns_amount"`
@@ -392,12 +386,12 @@ type GetFinancialResultResultDetailOthersItem struct {
 }
 
 // Returns information about a created report by its identifier
-func (c Reports) GetFinancial(params *GetFinancialReportParams) (*GetFinancialReportResponse, error) {
+func (c Reports) GetFinancial(ctx context.Context, params *GetFinancialReportParams) (*GetFinancialReportResponse, error) {
 	url := "/v1/finance/cash-flow-statement/list"
 
 	resp := &GetFinancialReportResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -440,92 +434,12 @@ type GetProductsReportResult struct {
 }
 
 // Method for getting a report with products data. For example, Ozon ID, number of products, prices, status
-func (c Reports) GetProducts(params *GetProductsReportParams) (*GetProductsReportResponse, error) {
+func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParams) (*GetProductsReportResponse, error) {
 	url := "/v1/report/products/create"
 
 	resp := &GetProductsReportResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type GetStocksReportParams struct {
-	// Default: "DEFAULT"
-	// Response language:
-	//   - RU — Russian
-	//   - EN — English
-	Language string `json:"language" default:"DEFAULT"`
-}
-
-type GetStocksReportResponse struct {
-	core.CommonResponse
-
-	// Method result
-	Result GetStocksReportResult `json:"result"`
-}
-
-type GetStocksReportResult struct {
-	// Unique report identifier
-	Code string `json:"code"`
-}
-
-// Report with information about the number of available and reserved products in stock
-func (c Reports) GetStocks(params *GetStocksReportParams) (*GetStocksReportResponse, error) {
-	url := "/v1/report/stock/create"
-
-	resp := &GetStocksReportResponse{}
-
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type GetProductsMovementReportParams struct {
-	// Date from which the data will be in the report
-	DateFrom time.Time `json:"date_from"`
-
-	// Date up to which the data will be in the report
-	DateTo time.Time `json:"date_to"`
-
-	// Default: "DEFAULT"
-	// Response language:
-	//   - RU — Russian
-	//   - EN — English
-	Language string `json:"language" default:"DEFAULT"`
-}
-
-type GetProductsMovementReportResponse struct {
-	core.CommonResponse
-
-	// Method result
-	Result GetProductsMovementReportResult `json:"result"`
-}
-
-type GetProductsMovementReportResult struct {
-	// Unique report identifier
-	Code string `json:"code"`
-}
-
-// Report with complete information on products, as well as the number of products with statuses:
-//   - products with defects or in inventory,
-//   - products in transit between the fulfillment centers,
-//   - products in delivery,
-//   - products to be sold
-func (c Reports) GetProductsMovement(params *GetProductsMovementReportParams) (*GetProductsMovementReportResponse, error) {
-	url := "/v1/report/products/movement/create"
-
-	resp := &GetProductsMovementReportResponse{}
-
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -564,19 +478,19 @@ type GetReturnsReportResponse struct {
 }
 
 type GetReturnReportResult struct {
-	// Unique report identifier
+	// Unique report identifier. The report is available for downloading within 3 days after making a request.
 	Code string `json:"code"`
 }
 
 // The report contains information about returned products that were accepted from the customer, ready for pickup, or delivered to the seller.
 //
 // The method is only suitable for orders shipped from the seller's warehouse
-func (c Reports) GetReturns(params *GetReturnsReportParams) (*GetReturnsReportResponse, error) {
+func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams) (*GetReturnsReportResponse, error) {
 	url := "/v1/report/returns/create"
 
 	resp := &GetReturnsReportResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -600,9 +514,12 @@ type GetShipmentReportFilter struct {
 	// Cancellation reason identifier
 	CancelReasonId []int64 `json:"cancel_reason_id"`
 
-	// Work scheme: FBO or FBS.
+	// The scheme of operation is FBO or FBS.
 	//
-	// To get an FBO scheme report, pass fbo in this parameter. For an FBS scheme report pass fbs
+	// Only one of the parameters can be passed to the array per query:
+	//
+	// fbo - to get a report by FBO scheme,
+	// fbs - to get a report by FBS scheme
 	DeliverySchema []string `json:"delivery_schema"`
 
 	// Product identifier
@@ -646,12 +563,12 @@ type GetShipmentReportResult struct {
 //   - shipment numbers
 //   - shipment costs
 //   - shipments contents
-func (c Reports) GetShipment(params *GetShipmentReportParams) (*GetShipmentReportResponse, error) {
+func (c Reports) GetShipment(ctx context.Context, params *GetShipmentReportParams) (*GetShipmentReportResponse, error) {
 	url := "/v1/report/postings/create"
 
 	resp := &GetShipmentReportResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -671,12 +588,12 @@ type IssueOnDiscountedProductsResponse struct {
 // For example, Ozon can discount a product due to damage when delivering.
 //
 // Returns report identifier. To get the report, send the identifier in the request body of a method `/v1/report/discounted/info`
-func (c Reports) IssueOnDiscountedProducts() (*IssueOnDiscountedProductsResponse, error) {
+func (c Reports) IssueOnDiscountedProducts(ctx context.Context) (*IssueOnDiscountedProductsResponse, error) {
 	url := "/v1/report/discounted/create"
 
 	resp := &IssueOnDiscountedProductsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -685,58 +602,36 @@ func (c Reports) IssueOnDiscountedProducts() (*IssueOnDiscountedProductsResponse
 	return resp, nil
 }
 
-type ReportOnDiscountedProductsParams struct {
+type GetFBSStocksParams struct {
+	// Response language
+	Language string `json:"language"`
+
+	// Warehouses identifiers
+	WarehouseIds []int64 `json:"warehouse_id"`
+}
+
+type GetFBSStocksResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result GetFBSStocksResult `json:"result"`
+}
+
+type GetFBSStocksResult struct {
 	// Unique report identifier
 	Code string `json:"code"`
 }
 
-type ReportOnDiscountedProductsResponse struct {
+// Report with information about the number of available and reserved products in stock.
-	core.CommonResponse
+//
+// The method returns a report identifier.
+// To get the report, send the identifier in the request of the `/v1/report/info` method.
+func (c Reports) GetFBSStocks(ctx context.Context, params *GetFBSStocksParams) (*GetFBSStocksResponse, error) {
+	url := "/v1/report/warehouse/stock"
 
-	// Report information
+	resp := &GetFBSStocksResponse{}
-	Report ReportonDiscountedProductsReport `json:"report"`
-}
 
-type ReportonDiscountedProductsReport struct {
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
-	// Report creation date
-	CreatedAt time.Time `json:"created_at"`
-
-	// Link to report file
-	File string `json:"file"`
-
-	// Report status:
-	//   - success — created
-	//   - pending — waiting to be processed
-	//   - processing — processed
-	//   - failed — generation error
-	Status string `json:"status"`
-
-	// Report generation error code
-	Error string `json:"error"`
-}
-
-// By report identifier, returns information about the report generated earlier
-func (c Reports) ReportOnDiscountedProducts(params *ReportOnDiscountedProductsParams) (*ReportOnDiscountedProductsResponse, error) {
-	url := "/v1/report/discounted/info"
-
-	resp := &ReportOnDiscountedProductsResponse{}
-
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-// By report identifier, returns information about the report generated earlier
-func (c Reports) ListReportsOnDiscountedProducts() (*ReportOnDiscountedProductsResponse, error) {
-	url := "/v1/report/discounted/list"
-
-	resp := &ReportOnDiscountedProductsResponse{}
-
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/reports_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -69,11 +70,15 @@ func TestGetList(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetList(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetList(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetReportsListResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -111,7 +116,7 @@ func TestGetReportDetails(t *testing.T) {
 				  "file": "https://storage.yandexcloud.net/ozon.reports/95/c1/95c1ae93320294cb.csv",
 				  "report_type": "seller_products",
 				  "params": {},
-				  "created_at": "2021-11-25T14:54:55.688260Z"
+				  "created_at": "2021-11-25T14:54:55.68826Z"
 				}
 			}`,
 		},
@@ -130,11 +135,15 @@ func TestGetReportDetails(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetReportDetails(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetReportDetails(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetReportDetailsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -255,8 +264,7 @@ func TestGetFinancialReport(t *testing.T) {
 					},
 					"end_balance_amount": 0
 				  }
-				},
+				}
-				"page_count": 15
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -274,11 +282,15 @@ func TestGetFinancialReport(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetFinancial(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetFinancial(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFinancialReportResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -328,117 +340,14 @@ func TestGetProductsReport(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
-		if resp.StatusCode != test.statusCode {
+		compareJsonResponse(t, test.response, &GetProductsReportResponse{})
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-
-		if resp.StatusCode == http.StatusOK {
-			if resp.Result.Code == "" {
-				t.Errorf("Code cannot be empty")
-			}
-		}
-	}
-}
-
-func TestGetStocksReport(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetStocksReportParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetStocksReportParams{},
-			`{
-				"result": {
-				  "code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
-				}
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetStocksReportParams{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-		},
-	}
-
-	for _, test := range tests {
-		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
-
-		resp, err := c.Reports().GetStocks(test.params)
-		if err != nil {
-			t.Error(err)
-		}
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-
-		if resp.StatusCode == http.StatusOK {
-			if resp.Result.Code == "" {
-				t.Errorf("Code cannot be empty")
-			}
-		}
-	}
-}
-
-func TestGetProductsMovementReport(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetProductsMovementReportParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetProductsMovementReportParams{
-				DateFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2020-08-01T14:15:22Z"),
-				DateTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2020-08-01T14:15:22Z"),
-			},
-			`{
-				"result": {
-				  "code": "h56f4917-1346-4e64-9d90-с6e736c1e07c"
-				}
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetProductsMovementReportParams{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-		},
-	}
-
-	for _, test := range tests {
-		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
-
-		resp, err := c.Reports().GetProductsMovement(test.params)
-		if err != nil {
-			t.Error(err)
-		}
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
@@ -491,11 +400,15 @@ func TestGetReturnsReport(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetReturns(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetReturns(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetReturnsReportResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -549,11 +462,15 @@ func TestGetShipmentReport(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().GetShipment(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().GetShipment(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetShipmentReportResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -596,9 +513,11 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().IssueOnDiscountedProducts()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Reports().IssueOnDiscountedProducts(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -606,6 +525,7 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 		}
 
 		if resp.StatusCode == http.StatusOK {
+			compareJsonResponse(t, test.response, &IssueOnDiscountedProductsResponse{})
 			if resp.Code == "" {
 				t.Errorf("Code cannot be empty")
 			}
@@ -613,28 +533,26 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 	}
 }
 
-func TestReportOnDiscountedProducts(t *testing.T) {
+func TestGetFBSStocks(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
 		statusCode int
 		headers    map[string]string
-		params     *ReportOnDiscountedProductsParams
+		params     *GetFBSStocksParams
 		response   string
 	}{
 		// Test Ok
 		{
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ReportOnDiscountedProductsParams{
+			&GetFBSStocksParams{
-				Code: "d55f4517-8347-4e24-9d93-d6e736c1c07c",
+				Language:     "EN",
+				WarehouseIds: []int64{123},
 			},
 			`{
-				"report": {
+				"result": {
-				  "created_at": "2022-10-04T10:07:08.146Z",
+					"code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
-				  "error": "string",
-				  "file": "string",
-				  "status": "string"
 				}
 			}`,
 		},
@@ -642,7 +560,7 @@ func TestReportOnDiscountedProducts(t *testing.T) {
 		{
 			http.StatusUnauthorized,
 			map[string]string{},
-			&ReportOnDiscountedProductsParams{},
+			&GetFBSStocksParams{},
 			`{
 				"code": 16,
 				"message": "Client-Id and Api-Key headers are required"
@@ -653,59 +571,15 @@ func TestReportOnDiscountedProducts(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Reports().ReportOnDiscountedProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		if err != nil {
+		resp, err := c.Reports().GetFBSStocks(ctx, test.params)
-			t.Error(err)
-		}
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestListReportsOnDiscountedProducts(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			`{
-				"reports": [
-				  {
-					"created_at": "2022-10-04T10:07:08.146Z",
-					"error": "string",
-					"file": "string",
-					"status": "string"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-		},
-	}
-
-	for _, test := range tests {
-		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
-
-		resp, err := c.Reports().ListReportsOnDiscountedProducts()
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFBSStocksResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/returns.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -78,12 +79,12 @@ type GetFBOReturnsReturn struct {
 }
 
 // Method for getting information on returned products that are sold from the Ozon warehouse
-func (c Returns) GetFBOReturns(params *GetFBOReturnsParams) (*GetFBOReturnsResponse, error) {
+func (c Returns) GetFBOReturns(ctx context.Context, params *GetFBOReturnsParams) (*GetFBOReturnsResponse, error) {
 	url := "/v3/returns/company/fbo"
 
 	resp := &GetFBOReturnsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +161,7 @@ type GetFBSReturnsResponse struct {
 
 type GetFBSReturnResultReturn struct {
 	// Time of receiving the return from the customer
-	AcceptedFromCustomerAmount string `json:"accepted_from_customer_amount"`
+	AcceptedFromCustomerMoment string `json:"accepted_from_customer_moment"`
 
 	// Bottom barcode on the product label
 	ClearingId int64 `json:"clearing_id"`
@@ -247,12 +248,626 @@ type GetFBSReturnResultReturn struct {
 }
 
 // Method for getting information on returned products that are sold from the seller's warehouse
-func (c Returns) GetFBSReturns(params *GetFBSReturnsParams) (*GetFBSReturnsResponse, error) {
+func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams) (*GetFBSReturnsResponse, error) {
 	url := "/v3/returns/company/fbs"
 
 	resp := &GetFBSReturnsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetRFBSReturnsParams struct {
+	// Filter
+	Filter GetRFBSReturnsFilter `json:"filter"`
+
+	// Identifier of the last value on the page.
+	// Leave this field blank in the first request
+	LastId int32 `json:"last_id"`
+
+	// Number of values per page
+	Limit int32 `json:"limit"`
+}
+
+type GetRFBSReturnsFilter struct {
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Filter by request statuses
+	GroupState []RFBSReturnsGroupState `json:"group_state"`
+
+	// Period of request creation
+	CreatedAt GetRFBSReturnsFilterCreatedAt `json:"created_at"`
+}
+
+type GetRFBSReturnsFilterCreatedAt struct {
+	// Period start date
+	From time.Time `json:"from"`
+
+	// Period end date
+	To time.Time `json:"to"`
+}
+
+type GetRFBSReturnsResponse struct {
+	core.CommonResponse
+
+	// Information on return requests
+	Returns GetRFBSReturnsReturn `json:"returns"`
+}
+
+type GetRFBSReturnsReturn struct {
+	// Customer name
+	ClientName string `json:"client_name"`
+
+	// Request creation date
+	CreatedAt time.Time `json:"created_at"`
+
+	// Order number
+	OrderNumber string `json:"order_number"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Product details
+	Product GetRFBSReturnsProduct `json:"product"`
+
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+
+	// Return request number
+	ReturnNumber string `json:"return_number"`
+
+	// Request and refund statuses
+	State GetRFBSReturnsState `json:"state"`
+}
+
+type GetRFBSReturnsProduct struct {
+	// Product name
+	Name string `json:"name"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Currency of your prices. It matches the currency set in your personal account
+	CurrencyCode GetRFBSReturnsCurrency `json:"currency_code"`
+
+	// Product price
+	Price string `json:"price"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+}
+
+type GetRFBSReturnsState struct {
+	// Request status by the applied filter
+	GroupState RFBSReturnsGroupState `json:"group_state"`
+
+	// Refund status
+	MoneyReturnStateName string `json:"money_return_state_name"`
+
+	// Request status
+	State string `json:"state"`
+
+	// Request status name in Russian
+	StateName string `json:"state_name"`
+}
+
+// Get a list of return requests
+func (c Returns) GetRFBSReturns(ctx context.Context, params *GetRFBSReturnsParams) (*GetRFBSReturnsResponse, error) {
+	url := "/v2/returns/rfbs/list"
+
+	resp := &GetRFBSReturnsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetRFBSReturnParams struct {
+	// Request identifier
+	ReturnId int64 `json:"return_id"`
+}
+
+type GetRFBSReturnResponse struct {
+	core.CommonResponse
+
+	Returns GetRFBSReturn `json:"returns"`
+}
+
+type GetRFBSReturn struct {
+	// List of available actions on the request
+	AvailableActions []GetRFBSReturnAction `json:"available_actions"`
+
+	// Customer name
+	ClientName string `json:"client_name"`
+
+	// Links to product images
+	ClientPhoto []string `json:"client_photo"`
+
+	// Information on return method
+	ClientReturnMethodType GetRFBSReturnMethodType `json:"client_return_method_type"`
+
+	// Customer comment
+	Comment string `json:"comment"`
+
+	// Request creation date
+	CreatedAt time.Time `json:"created_at"`
+
+	// Order number
+	OrderNumber string `json:"order_number"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Product details
+	Product GetRFBSReturnsProduct `json:"product"`
+
+	// Comment on request rejection
+	RejectionComment string `json:"rejection_comment"`
+
+	// Information on rejection reason
+	RejectionReason []GetRFBSReturnRejectionReason `json:"rejection_reason"`
+
+	// Method of product return
+	ReturnMethodDescription string `json:"return_method_description"`
+
+	// Return request number
+	ReturnNumber string `json:"return_number"`
+
+	// Information on return reason
+	ReturnReason GetRFBSReturnReason `json:"return_reason"`
+
+	// Postal tracking number
+	RUPostTrackingNumber string `json:"ru_post_tracking_number"`
+
+	// Information on return status
+	State GetRFBSReturnState `json:"state"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+type GetRFBSReturnAction struct {
+	// Action identifier
+	Id int32 `json:"id"`
+
+	// Action name
+	Name string `json:"name"`
+}
+
+type GetRFBSReturnMethodType struct {
+	// Identifier
+	Id int32 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
+}
+
+type GetRFBSReturnRejectionReason struct {
+	// Hint on further actions with the return
+	Hint string `json:"hint"`
+
+	// Reason identifier
+	Id int32 `json:"id"`
+
+	// `true` if you need to attach a comment
+	IsCommentRequired bool `json:"is_comment_required"`
+
+	// Reason description
+	Name string `json:"name"`
+}
+
+type GetRFBSReturnReason struct {
+	// Reason identifier
+	Id int32 `json:"id"`
+
+	// `true` if the product is defective
+	IsDefect bool `json:"is_defect"`
+
+	// Reason description
+	Name string `json:"name"`
+}
+
+type GetRFBSReturnState struct {
+	// Status
+	State string `json:"state"`
+
+	// Status name in Russian
+	StateName string `json:"state_name"`
+}
+
+// Get information about a return request
+func (c Returns) GetRFBSReturn(ctx context.Context, params *GetRFBSReturnParams) (*GetRFBSReturnResponse, error) {
+	url := "/v2/returns/rfbs/get"
+
+	resp := &GetRFBSReturnResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type RejectRFBSReturnParams struct {
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+
+	// Comment
+	//
+	// The comment is required if the
+	// `rejection_reason.is_comment_required` parameter is `true`
+	// in the response of the `/v2/returns/rfbs/get` method
+	Comment string `json:"comment"`
+
+	// Rejection reason identifier.
+	//
+	// Pass the value from the list of reasons received in the response
+	// of the `/v2/returns/rfbs/get` method in the `rejection_reason` parameter
+	RejectionReasonId int64 `json:"rejection_reason_id"`
+}
+
+type RejectRFBSReturnResponse struct {
+	core.CommonResponse
+}
+
+// The method rejects an rFBS return request. Explain your decision in the `comment` parameter
+func (c Returns) RejectRFBSReturn(ctx context.Context, params *RejectRFBSReturnParams) (*RejectRFBSReturnResponse, error) {
+	url := "/v2/returns/rfbs/reject"
+
+	resp := &RejectRFBSReturnResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type CompensateRFBSReturnParams struct {
+	// Compensation amount
+	CompensationAmount string `json:"compensation_amount"`
+
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+}
+
+type CompensateRFBSReturnResponse struct {
+	core.CommonResponse
+}
+
+// Using this method you can confirm the partial compensation and agree to keep the product with the customer
+func (c Returns) CompensateRFBSReturn(ctx context.Context, params *CompensateRFBSReturnParams) (*CompensateRFBSReturnResponse, error) {
+	url := "/v2/returns/rfbs/compensate"
+
+	resp := &CompensateRFBSReturnResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type ApproveRFBSReturnParams struct {
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+
+	// Method of product return
+	ReturnMethodDescription string `json:"return_method_description"`
+}
+
+type ApproveRFBSReturnResponse struct {
+	core.CommonResponse
+}
+
+// The method allows to approve an rFBS return request and agree to receive products for verification.
+//
+// Confirm that you've received the product using the `/v2/returns/rfbs/receive-return` method.
+func (c Returns) ApproveRFBSReturn(ctx context.Context, params *ApproveRFBSReturnParams) (*ApproveRFBSReturnResponse, error) {
+	url := "/v2/returns/rfbs/verify"
+
+	resp := &ApproveRFBSReturnResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type ReceiveRFBSReturnParams struct {
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+}
+
+type ReceiveRFBSReturnResponse struct {
+	core.CommonResponse
+}
+
+// Confirm receipt of a product for check
+func (c Returns) ReceiveRFBSReturn(ctx context.Context, params *ReceiveRFBSReturnParams) (*ReceiveRFBSReturnResponse, error) {
+	url := "/v2/returns/rfbs/receive-return"
+
+	resp := &ReceiveRFBSReturnResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type RefundRFBSParams struct {
+	// Return request identifier
+	ReturnId int64 `json:"return_id"`
+
+	// Refund amount for shipping the product
+	ReturnForBackWay int64 `json:"return_for_back_way"`
+}
+
+type RefundRFBSResponse struct {
+	core.CommonResponse
+}
+
+// The method confirms the refund of the full product cost.
+// Use the method if you agree to refund the customer:
+//
+// Immediately without receiving the product.
+// After you received and checked the product.
+// If the product is defective or damaged, you also refund its return shipment cost.
+func (c Returns) RefundRFBS(ctx context.Context, params *RefundRFBSParams) (*RefundRFBSResponse, error) {
+	url := "/v2/returns/rfbs/return-money"
+
+	resp := &RefundRFBSResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type IsGiveoutEnabledResponse struct {
+	core.CommonResponse
+
+	// `true` if you can pick up a return shipment by barcode.
+	Enabled bool `json:"enabled"`
+}
+
+// Check the ability to receive return shipments by barcode
+//
+// The `enabled` parameter is true if you can pick up return shipments by barcode.
+func (c Returns) IsGiveoutEnabled(ctx context.Context) (*IsGiveoutEnabledResponse, error) {
+	url := "/v1/return/giveout/is-enabled"
+
+	resp := &IsGiveoutEnabledResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetGiveoutResponse struct {
+	core.CommonResponse
+
+	// PDF file with barcode in binary format
+	FileContent string `json:"file_content"`
+
+	// File name
+	FileName string `json:"file_name"`
+
+	// File type
+	ContentType string `json:"content_type"`
+}
+
+// Barcode for return shipment in PDF format
+//
+// Returns a PDF file with a barcode
+func (c Returns) GetGiveoutPDF(ctx context.Context) (*GetGiveoutResponse, error) {
+	url := "/v1/return/giveout/get-pdf"
+
+	resp := &GetGiveoutResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+// Barcode for return shipment in PNG format
+//
+// Returns a PNG file with a barcode
+func (c Returns) GetGiveoutPNG(ctx context.Context) (*GetGiveoutResponse, error) {
+	url := "/v1/return/giveout/get-png"
+
+	resp := &GetGiveoutResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetGiveoutBarcodeResponse struct {
+	core.CommonResponse
+
+	// Barcode value in text format
+	Barcode string `json:"barcode"`
+}
+
+// Value of barcode for return shipments
+//
+// Use this method to get the barcode from the response of the
+// `/v1/return/giveout/get-png` and `/v1/return/giveout/get-pdf` methods in text format
+func (c Returns) GetGiveoutBarcode(ctx context.Context) (*GetGiveoutBarcodeResponse, error) {
+	url := "/v1/return/giveout/barcode"
+
+	resp := &GetGiveoutBarcodeResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+// Use this method if an unauthorized person has gained access to your barcode.
+//
+// The method returns a PNG file with the new barcode. Once the method is used,
+// you won't be able to get a return shipment using the old barcodes.
+// To get a new barcode in PDF format, use the /v1/return/giveout/get-pdf method
+func (c Returns) ResetGiveoutBarcode(ctx context.Context) (*GetGiveoutResponse, error) {
+	url := "/v1/return/giveout/barcode-reset"
+
+	resp := &GetGiveoutResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetGiveoutListParams struct {
+	// Identifier of the last value on the page
+	LastId int64 `json:"last_id"`
+
+	// Number of values in the response
+	Limit int64 `json:"limit"`
+}
+
+type GetGiveoutListResponse struct {
+	core.CommonResponse
+
+	// Shipment identifier
+	Giveouts []GetGiveoutListGiveout `json:"giveouts"`
+}
+
+type GetGiveoutListGiveout struct {
+	// Number of products in shipment
+	ApprovedArticlesCount int32 `json:"approved_articles_count"`
+
+	// Creation date and time
+	CreatedAt time.Time `json:"created_at"`
+
+	// Shipment identifier
+	GiveoutId int64 `json:"giveout_id"`
+
+	// Return shipment status
+	GiveoutStatus GiveoutStatus `json:"giveout_status"`
+
+	// Total number of products to be picked up from the warehouse
+	TotalArticlesCount int32 `json:"total_articles_count"`
+
+	// Warehouse address
+	WarehouseAddress string `json:"warehouse_address"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+
+	// Warehouse name
+	WarehouseName string `json:"warehouse_name"`
+}
+
+// Return shipments list
+func (c Returns) GetGiveoutList(ctx context.Context, params *GetGiveoutListParams) (*GetGiveoutListResponse, error) {
+	url := "/v1/return/giveout/list"
+
+	resp := &GetGiveoutListResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetGiveoutInfoParams struct {
+	// Shipment identifier
+	GiveoutId int64 `json:"giveout_id"`
+}
+
+type GetGiveoutInfoResponse struct {
+	core.CommonResponse
+
+	// Product IDs
+	Articles []GetGiveoutInfoArticle `json:"articles"`
+
+	// Shipment identifier
+	GiveoutId int64 `json:"giveout_id"`
+
+	// Return shipment status
+	GiveoutStatus GiveoutStatus `json:"giveout_status"`
+
+	// Warehouse address
+	WarehouseAddress string `json:"warehouse_address"`
+
+	// Warehouse name
+	WarehouseName string `json:"warehouse_name"`
+}
+
+type GetGiveoutInfoArticle struct {
+	// `true` if the shipment is confirmed
+	Approved bool `json:"approved"`
+
+	// Delivery schema
+	DeliverySchema GiveoutDeliverySchema `json:"delivery_schema"`
+
+	// Product name
+	Name string `json:"name"`
+
+	// Seller identifier
+	SellerId int64 `json:"seller_id"`
+}
+
+// Information on return shipment
+func (c Returns) GetGiveoutInfo(ctx context.Context, params *GetGiveoutInfoParams) (*GetGiveoutInfoResponse, error) {
+	url := "/v1/return/giveout/info"
+
+	resp := &GetGiveoutInfoResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/returns_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -61,11 +62,15 @@ func TestGetFBOReturns(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Returns().GetFBOReturns(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetFBOReturns(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFBOReturnsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -159,11 +164,15 @@ func TestGetFBSReturns(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Returns().GetFBSReturns(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetFBSReturns(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetFBSReturnsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -186,3 +195,795 @@ func TestGetFBSReturns(t *testing.T) {
 		}
 	}
 }
+
+func TestGetRFBSReturns(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetRFBSReturnsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetRFBSReturnsParams{
+				LastId: 999,
+				Limit:  555,
+				Filter: GetRFBSReturnsFilter{
+					OfferId:       "123",
+					PostingNumber: "111",
+					GroupState:    []RFBSReturnsGroupState{RFBSReturnsGroupStateAll},
+					CreatedAt: GetRFBSReturnsFilterCreatedAt{
+						From: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+						To:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					},
+				},
+			},
+			`{
+				"returns": {
+				  "client_name": "string",
+				  "created_at": "2019-08-24T14:15:22Z",
+				  "order_number": "string",
+				  "posting_number": "111",
+				  "product": {
+					"name": "string",
+					"offer_id": "123",
+					"currency_code": "string",
+					"price": "string",
+					"sku": 123
+				  },
+				  "return_id": 0,
+				  "return_number": "string",
+				  "state": {
+					"group_state": "All",
+					"money_return_state_name": "string",
+					"state": "string",
+					"state_name": "string"
+				  }
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetRFBSReturnsParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetRFBSReturns(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetRFBSReturnsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if resp.StatusCode == http.StatusOK {
+			if resp.Returns.Product.OfferId != test.params.Filter.OfferId {
+				t.Errorf("expected offer ID %s, but got: %s", test.params.Filter.OfferId, resp.Returns.Product.OfferId)
+			}
+			if resp.Returns.PostingNumber != test.params.Filter.PostingNumber {
+				t.Errorf("expected posting number %s, but got: %s", test.params.Filter.PostingNumber, resp.Returns.PostingNumber)
+			}
+			if resp.Returns.State.GroupState != test.params.Filter.GroupState[0] {
+				t.Errorf("expected group state %s, but got: %s", test.params.Filter.GroupState[0], resp.Returns.State.GroupState)
+			}
+		}
+	}
+}
+
+func TestGetRFBSReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetRFBSReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetRFBSReturnParams{
+				ReturnId: 123,
+			},
+			`{
+				"returns": {
+				  "available_actions": [
+					{
+					  "id": 0,
+					  "name": "string"
+					}
+				  ],
+				  "client_name": "string",
+				  "client_photo": [
+					"string"
+				  ],
+				  "client_return_method_type": {
+					"id": 0,
+					"name": "string"
+				  },
+				  "comment": "string",
+				  "created_at": "2019-08-24T14:15:22Z",
+				  "order_number": "string",
+				  "posting_number": "string",
+				  "product": {
+					"name": "string",
+					"offer_id": "string",
+					"currency_code": "string",
+					"price": "string",
+					"sku": 0
+				  },
+				  "rejection_comment": "string",
+				  "rejection_reason": [
+					{
+					  "hint": "string",
+					  "id": 0,
+					  "is_comment_required": true,
+					  "name": "string"
+					}
+				  ],
+				  "return_method_description": "string",
+				  "return_number": "string",
+				  "return_reason": {
+					"id": 0,
+					"is_defect": true,
+					"name": "string"
+				  },
+				  "ru_post_tracking_number": "string",
+				  "state": {
+					"state": "string",
+					"state_name": "string"
+				  },
+				  "warehouse_id": 0
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetRFBSReturnParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetRFBSReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetRFBSReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestRejectRFBSReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *RejectRFBSReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&RejectRFBSReturnParams{
+				ReturnId:          123,
+				Comment:           "No comment",
+				RejectionReasonId: 111,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&RejectRFBSReturnParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().RejectRFBSReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &RejectRFBSReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestCompensateRFBSreturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CompensateRFBSReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CompensateRFBSReturnParams{
+				ReturnId:           123,
+				CompensationAmount: "11",
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CompensateRFBSReturnParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().CompensateRFBSReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CompensateRFBSReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestApproveRFBSReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ApproveRFBSReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ApproveRFBSReturnParams{
+				ReturnId:                123,
+				ReturnMethodDescription: "some description",
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ApproveRFBSReturnParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().ApproveRFBSReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ApproveRFBSReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestReceiveRFBSReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ReceiveRFBSReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ReceiveRFBSReturnParams{
+				ReturnId: 123,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ReceiveRFBSReturnParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().ReceiveRFBSReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ReceiveRFBSReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestRefundRFBS(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *RefundRFBSParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&RefundRFBSParams{
+				ReturnId:         123,
+				ReturnForBackWay: 111,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&RefundRFBSParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().RefundRFBS(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &RefundRFBSResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestIsGiveoutEnabled(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"enabled": true
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().IsGiveoutEnabled(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &IsGiveoutEnabledResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetGiveoutPDF(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"content_type": "application/pdf",
+				"file_name": "string",
+				"file_content": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetGiveoutPDF(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetGiveoutPNG(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"content_type": "image/png",
+				"file_name": "string",
+				"file_content": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetGiveoutPNG(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetGiveoutBarcode(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"barcode": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetGiveoutBarcode(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutBarcodeResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestResetGiveoutBarcode(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"content_type": "image/png",
+				"file_name": "string",
+				"file_content": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().ResetGiveoutBarcode(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetGiveoutList(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetGiveoutListParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetGiveoutListParams{
+				LastId: 0,
+				Limit:  0,
+			},
+			`{
+				"giveouts": [
+				  {
+					"approved_articles_count": 0,
+					"created_at": "2019-08-24T14:15:22Z",
+					"giveout_id": 0,
+					"giveout_status": "string",
+					"total_articles_count": 0,
+					"warehouse_address": "string",
+					"warehouse_id": 0,
+					"warehouse_name": "string"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetGiveoutListParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetGiveoutList(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutListResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetGiveoutInfo(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetGiveoutInfoParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetGiveoutInfoParams{
+				GiveoutId: 11,
+			},
+			`{
+				"articles": [
+				  {
+					"approved": true,
+					"delivery_schema": "string",
+					"name": "string",
+					"seller_id": 0
+				  }
+				],
+				"giveout_id": 11,
+				"giveout_status": "string",
+				"warehouse_address": "string",
+				"warehouse_name": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetGiveoutInfoParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+		},
+	}
+
+	for _, test := range tests {
+		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
+
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Returns().GetGiveoutInfo(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetGiveoutInfoResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+		if resp.GiveoutId != test.params.GiveoutId {
+			t.Errorf("expected giveout id to be equal: got: %d, expected: %d", resp.GiveoutId, test.params.GiveoutId)
+		}
+	}
+}

ozon/strategies.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 
 	core "github.com/diphantxm/ozon-api-client"
@@ -23,7 +24,7 @@ type ListCompetitorsResponse struct {
 	core.CommonResponse
 
 	// List of competitors
-	Competitors []ListCompetitorsCompetitor `json:"competitors"`
+	Competitor []ListCompetitorsCompetitor `json:"competitor"`
 
 	// Total number of competitors
 	Total int32 `json:"total"`
@@ -31,19 +32,19 @@ type ListCompetitorsResponse struct {
 
 type ListCompetitorsCompetitor struct {
 	// Competitor's name
-	Name string `json:"name"`
+	Name string `json:"competitor_name"`
 
 	// Competitor identifier
-	Id int64 `json:"id"`
+	Id int64 `json:"competitor_id"`
 }
 
 // Method for getting a list of competitors—sellers with similar products in other online stores and marketplaces
-func (c Strategies) ListCompetitors(params *ListCompetitorsParams) (*ListCompetitorsResponse, error) {
+func (c Strategies) ListCompetitors(ctx context.Context, params *ListCompetitorsParams) (*ListCompetitorsResponse, error) {
 	url := "/v1/pricing-strategy/competitors/list"
 
 	resp := &ListCompetitorsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -73,10 +74,10 @@ type ListStrategiesResponse struct {
 
 type ListStrategiesStrategy struct {
 	// Strategy identifier
-	Id string `json:"id"`
+	Id string `json:"strategy_id"`
 
 	// Strategy name
-	Name string `json:"name"`
+	Name string `json:"strategy_name"`
 
 	// Strategy type
 	Type StrategyType `json:"type"`
@@ -97,12 +98,12 @@ type ListStrategiesStrategy struct {
 	Enabled bool `json:"enabled"`
 }
 
-func (c Strategies) List(params *ListStrategiesParams) (*ListStrategiesResponse, error) {
+func (c Strategies) List(ctx context.Context, params *ListStrategiesParams) (*ListStrategiesResponse, error) {
 	url := "/v1/pricing-strategy/list"
 
 	resp := &ListStrategiesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -140,12 +141,12 @@ type CreateStrategyResult struct {
 	StrategyId string `json:"strategy_id"`
 }
 
-func (c Strategies) Create(params *CreateStrategyParams) (*CreateStrategyResponse, error) {
+func (c Strategies) Create(ctx context.Context, params *CreateStrategyParams) (*CreateStrategyResponse, error) {
 	url := "/v1/pricing-strategy/create"
 
 	resp := &CreateStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -183,12 +184,12 @@ type InfoStrategyResult struct {
 	UpdateType StrategyUpdateType `json:"update_type"`
 }
 
-func (c Strategies) Info(params *InfoStrategyParams) (*InfoStrategyResponse, error) {
+func (c Strategies) Info(ctx context.Context, params *InfoStrategyParams) (*InfoStrategyResponse, error) {
 	url := "/v1/pricing-strategy/info"
 
 	resp := &InfoStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -212,12 +213,12 @@ type UpdateStrategyResponse struct {
 	core.CommonResponse
 }
 
-func (c Strategies) Update(params *UpdateStrategyParams) (*UpdateStrategyResponse, error) {
+func (c Strategies) Update(ctx context.Context, params *UpdateStrategyParams) (*UpdateStrategyResponse, error) {
 	url := "/v1/pricing-strategy/update"
 
 	resp := &UpdateStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -260,12 +261,12 @@ type AddProductsToStrategyResultError struct {
 	ProductId int64 `json:"product_id"`
 }
 
-func (c Strategies) AddProducts(params *AddProductsToStrategyParams) (*AddProductsToStrategyResponse, error) {
+func (c Strategies) AddProducts(ctx context.Context, params *AddProductsToStrategyParams) (*AddProductsToStrategyResponse, error) {
 	url := "/v1/pricing-strategy/products/add"
 
 	resp := &AddProductsToStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -299,12 +300,12 @@ type GetStrategiesByProductIdsResultProductInfo struct {
 	StrategyId string `json:"strategy_id"`
 }
 
-func (c Strategies) GetByProductIds(params *GetStrategiesByProductIdsParams) (*GetStrategiesByProductIdsResponse, error) {
+func (c Strategies) GetByProductIds(ctx context.Context, params *GetStrategiesByProductIdsParams) (*GetStrategiesByProductIdsResponse, error) {
 	url := "/v1/pricing-strategy/strategy-ids-by-product-ids"
 
 	resp := &GetStrategiesByProductIdsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -330,12 +331,12 @@ type ListProductsInStrategyResult struct {
 	ProductId []string `json:"product_id"`
 }
 
-func (c Strategies) ListProducts(params *ListProductsInStrategyParams) (*ListProductsInStrategyResponse, error) {
+func (c Strategies) ListProducts(ctx context.Context, params *ListProductsInStrategyParams) (*ListProductsInStrategyResponse, error) {
 	url := "/v1/pricing-strategy/products/list"
 
 	resp := &ListProductsInStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -376,12 +377,12 @@ type GetCompetitorPriceResult struct {
 	StrategyCompetitorProductURL string `json:"strategy_competitor_product_url"`
 }
 
-func (c Strategies) GetCompetitorPrice(params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
+func (c Strategies) GetCompetitorPrice(ctx context.Context, params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
 	url := "/v1/pricing-strategy/product/info"
 
 	resp := &GetCompetitorPriceResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -407,12 +408,12 @@ type RemoveProductsFromStrategyResult struct {
 	FailedProductCount int32 `json:"failed_product_count"`
 }
 
-func (c Strategies) RemoveProducts(params *RemoveProductsFromStrategyParams) (*RemoveProductsFromStrategyResponse, error) {
+func (c Strategies) RemoveProducts(ctx context.Context, params *RemoveProductsFromStrategyParams) (*RemoveProductsFromStrategyResponse, error) {
 	url := "/v1/pricing-strategy/products/delete"
 
 	resp := &RemoveProductsFromStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -433,12 +434,12 @@ type ChangeStrategyStatusResponse struct {
 	core.CommonResponse
 }
 
-func (c Strategies) ChangeStatus(params *ChangeStrategyStatusParams) (*ChangeStrategyStatusResponse, error) {
+func (c Strategies) ChangeStatus(ctx context.Context, params *ChangeStrategyStatusParams) (*ChangeStrategyStatusResponse, error) {
 	url := "/v1/pricing-strategy/status"
 
 	resp := &ChangeStrategyStatusResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -456,12 +457,12 @@ type RemoveStrategyResponse struct {
 	core.CommonResponse
 }
 
-func (c Strategies) Remove(params *RemoveStrategyParams) (*RemoveStrategyResponse, error) {
+func (c Strategies) Remove(ctx context.Context, params *RemoveStrategyParams) (*RemoveStrategyResponse, error) {
 	url := "/v1/pricing-strategy/delete"
 
 	resp := &RemoveStrategyResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/strategies_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -49,11 +50,15 @@ func TestListCompetitors(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().ListCompetitors(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().ListCompetitors(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListCompetitorsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -108,11 +113,15 @@ func TestListStrategies(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().List(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().List(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListStrategiesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -155,7 +164,7 @@ func TestCreateStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
+				  "strategy_id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
 				}
 			}`,
 		},
@@ -174,11 +183,15 @@ func TestCreateStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().Create(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().Create(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &CreateStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -203,7 +216,7 @@ func TestInfoStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "strategy_name": "test1",
+				  "name": "test1",
 				  "enabled": true,
 				  "update_type": "strategyItemsListChanged",
 				  "type": "COMP_PRICE",
@@ -235,11 +248,15 @@ func TestInfoStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().Info(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().Info(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &InfoStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -302,11 +319,15 @@ func TestUpdateStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().Update(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().Update(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &UpdateStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -351,11 +372,15 @@ func TestAddProductsToStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().AddProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().AddProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &AddProductsToStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -404,11 +429,15 @@ func TestGetStrategiesByProductIds(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().GetByProductIds(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().GetByProductIds(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetStrategiesByProductIdsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -466,11 +495,15 @@ func TestListProductsInStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().ListProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().ListProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ListProductsInStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -519,11 +552,15 @@ func TestGetCompetitorPrice(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().GetCompetitorPrice(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().GetCompetitorPrice(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetCompetitorPriceResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -567,11 +604,15 @@ func TestRemoveProductsFromStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().RemoveProducts(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().RemoveProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &RemoveProductsFromStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -612,11 +653,15 @@ func TestChangeStrategyStatus(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().ChangeStatus(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().ChangeStatus(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &ChangeStatusToResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -656,11 +701,15 @@ func TestRemoveStrategy(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Strategies().Remove(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Strategies().Remove(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &RemoveStrategyResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/utils.go

@@ -0,0 +1,83 @@
+package ozon
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func compareJsonResponse(t *testing.T, expectedJSON string, response interface{}) {
+	err := json.Unmarshal([]byte(expectedJSON), response)
+	if err != nil {
+		t.Errorf("got error: %s", err)
+		return
+	}
+
+	after, err := json.Marshal(response)
+	if err != nil {
+		t.Errorf("got error: %s", err)
+		return
+	}
+
+	var j1, j2 map[string]interface{}
+	if err := json.NewDecoder(strings.NewReader(expectedJSON)).Decode(&j1); err != nil {
+		t.Errorf("got error: %s", err)
+		return
+	}
+	if err := json.NewDecoder(bytes.NewReader(after)).Decode(&j2); err != nil {
+		t.Errorf("got error: %s", err)
+		return
+	}
+
+	if err := compareJson(j1, j2, ""); err != nil {
+		t.Errorf("jsons are not equal: %s", err)
+		return
+	}
+}
+
+func compareJson(expected interface{}, actual interface{}, prefix string) error {
+	if expected == nil {
+		return nil
+	}
+
+	expectedType := reflect.TypeOf(expected).Kind()
+	actualType := reflect.TypeOf(actual).Kind()
+	if expectedType != actualType {
+		return fmt.Errorf("type for key %s is different: expected: %s, \ngot: %s", prefix, expectedType, actualType)
+	}
+
+	switch expected.(type) {
+	case map[string]interface{}:
+		expectedMap := expected.(map[string]interface{})
+		actualMap := actual.(map[string]interface{})
+		for k, v := range expectedMap {
+			key := fmt.Sprintf("%s.%s", prefix, k)
+
+			actualValue, ok := actualMap[k]
+			if !ok {
+				return fmt.Errorf("key %s is absent", key)
+			}
+			if err := compareJson(v, actualValue, key); err != nil {
+				return err
+			}
+		}
+	case []interface{}:
+		expectedSlice := expected.([]interface{})
+		actualSlice := actual.([]interface{})
+		for i := range expectedSlice {
+			key := fmt.Sprintf("%s.%d", prefix, i)
+			if err := compareJson(expectedSlice[i], actualSlice[i], key); err != nil {
+				return err
+			}
+		}
+	default:
+		if !reflect.DeepEqual(expected, actual) {
+			return fmt.Errorf("value for key %s is different: expected: %s, \ngot: %s", prefix, expected, actual)
+		}
+	}
+
+	return nil
+}

ozon/warehouses.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"time"
 
@@ -85,12 +86,12 @@ type GetListOfWarehousesResultFirstMile struct {
 }
 
 // You do not need to specify any parameters in the request. Your company will be identified by the Warehouses ID
-func (c Warehouses) GetListOfWarehouses() (*GetListOfWarehousesResponse, error) {
+func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehousesResponse, error) {
 	url := "/v1/warehouse/list"
 
 	resp := &GetListOfWarehousesResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -175,12 +176,12 @@ type GetListOfDeliveryMethodsResult struct {
 }
 
 // This methods allows you to get list of all delivery methods that can be applied for this warehouse
-func (c Warehouses) GetListOfDeliveryMethods(params *GetListOfDeliveryMethodsParams) (*GetListOfDeliveryMethodsResponse, error) {
+func (c Warehouses) GetListOfDeliveryMethods(ctx context.Context, params *GetListOfDeliveryMethodsParams) (*GetListOfDeliveryMethodsResponse, error) {
 	url := "/v1/delivery-method/list"
 
 	resp := &GetListOfDeliveryMethodsResponse{}
 
-	response, err := c.client.Request(http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/warehouses_test.go

@@ -1,6 +1,7 @@
 package ozon
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -58,11 +59,15 @@ func TestGetListOfWarehouses(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Warehouses().GetListOfWarehouses()
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Warehouses().GetListOfWarehouses(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetListOfWarehousesResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}
@@ -133,11 +138,15 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 	for _, test := range tests {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
-		resp, err := c.Warehouses().GetListOfDeliveryMethods(test.params)
+		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+		resp, err := c.Warehouses().GetListOfDeliveryMethods(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		compareJsonResponse(t, test.response, &GetListOfDeliveryMethodsResponse{})
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}