Update January 26, 2024 (#66)

add new status to fbo returns

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - name: Setup
         run: |
           go install github.com/mattn/goveralls@latest

README.md

@@ -23,6 +23,7 @@ A simple example on how to use this library:
 package main
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -33,11 +34,14 @@ import (
 func main() {
 	// Create a client with your Client-Id and Api-Key
 	// [Documentation]: https://docs.ozon.ru/api/seller/en/#tag/Auth
-	client := ozon.NewClient("my-client-id", "my-api-key")
+	opts := []ozon.ClientOption{
+		ozon.WithAPIKey("api-key"),
+		ozon.WithClientId("client-id"),
+	}
+	c := ozon.NewClient(opts...)
 
 	// Send request with parameters
-	ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
+	resp, err := client.Products().GetProductDetails(context.Background(), &ozon.GetProductDetailsParams{
 		ProductId: 123456789,
 	})
 	if err != nil || resp.StatusCode != http.StatusOK {

client.go

@@ -7,6 +7,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
+	"reflect"
 )
 
 type HttpClient interface {
@@ -34,14 +36,25 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 	}
 }
 
-func (c Client) newRequest(ctx context.Context, method string, url string, body interface{}) (*http.Request, error) {
+func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
+	// Set default values for empty fields if `default` tag is present
+	// And body is not nil
+	if body != nil {
+		if err := getDefaultValues(reflect.ValueOf(body)); err != nil {
+			return nil, err
+		}
+	}
+
 	bodyJson, err := json.Marshal(body)
 	if err != nil {
 		return nil, err
 	}
 
-	url = c.baseUrl + url
-	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(bodyJson))
+	uri, err = url.JoinPath(c.baseUrl, uri)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequestWithContext(ctx, method, uri, bytes.NewBuffer(bodyJson))
 	if err != nil {
 		return nil, err
 	}
@@ -58,11 +71,6 @@ func (c Client) Request(ctx context.Context, method string, path string, req, re
 	if err != nil {
 		return nil, err
 	}
-	rawQuery, err := buildRawQuery(httpReq, req)
-	if err != nil {
-		return nil, err
-	}
-	httpReq.URL.RawQuery = rawQuery
 
 	httpResp, err := c.client.Do(httpReq)
 	if err != nil {

client_test.go

@@ -66,6 +66,7 @@ func TestRequest(t *testing.T) {
 
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {

core.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"reflect"
+	"strconv"
 	"testing"
 	"time"
 )
@@ -32,51 +33,103 @@ func (r Response) CopyCommonResponse(rhs *CommonResponse) {
 	rhs.Message = r.Message
 }
 
-func getDefaultValues(v interface{}) (map[string]string, error) {
-	isNil, err := isZero(v)
-	if err != nil {
-		return make(map[string]string), err
-	}
-
-	if isNil {
-		return make(map[string]string), nil
-	}
-
-	out := make(map[string]string)
-
-	vType := reflect.TypeOf(v).Elem()
-	vValue := reflect.ValueOf(v).Elem()
+func getDefaultValues(v reflect.Value) error {
+	vValue := v.Elem()
+	vType := vValue.Type()
 
 	for i := 0; i < vType.NumField(); i++ {
 		field := vType.Field(i)
-		tag := field.Tag.Get("json")
-		defaultValue := field.Tag.Get("default")
 
-		if field.Type.Kind() == reflect.Slice {
-			// Attach any slices as query params
-			fieldVal := vValue.Field(i)
-			for j := 0; j < fieldVal.Len(); j++ {
-				out[tag] = fmt.Sprintf("%v", fieldVal.Index(j))
-			}
-		} else {
-			// Add any scalar values as query params
-			fieldVal := fmt.Sprintf("%v", vValue.Field(i))
-
-			// If no value was set by the user, use the default
-			// value specified in the struct tag.
-			if fieldVal == "" || fieldVal == "0" {
-				if defaultValue == "" {
+		switch field.Type.Kind() {
+		case reflect.Slice:
+			for j := 0; j < vValue.Field(i).Len(); j++ {
+				// skip if slice type is primitive
+				if vValue.Field(i).Index(j).Kind() != reflect.Struct {
 					continue
 				}
 
-				fieldVal = defaultValue
+				// Attach any slices as query params
+				err := getDefaultValues(vValue.Field(i).Index(j).Addr())
+				if err != nil {
+					return err
+				}
+			}
+		case reflect.String:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
 			}
 
-			out[tag] = fmt.Sprintf("%v", fieldVal)
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+
+			vValue.Field(i).SetString(defaultValue)
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
+			}
+
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+			defaultValueInt, err := strconv.Atoi(defaultValue)
+			if err != nil {
+				return err
+			}
+
+			vValue.Field(i).SetInt(int64(defaultValueInt))
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
+			}
+
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+			defaultValueUint, err := strconv.ParseUint(defaultValue, 10, 64)
+			if err != nil {
+				return err
+			}
+
+			vValue.Field(i).SetUint(uint64(defaultValueUint))
+		case reflect.Struct:
+			err := getDefaultValues(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+		case reflect.Ptr:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if isNil {
+				continue
+			}
+
+			if err := getDefaultValues(vValue.Field(i)); err != nil {
+				return err
+			}
+		default:
+			continue
 		}
 	}
 
-	return out, nil
+	return nil
 }
 
 func buildRawQuery(req *http.Request, v interface{}) (string, error) {
@@ -86,23 +139,20 @@ func buildRawQuery(req *http.Request, v interface{}) (string, error) {
 		return query.Encode(), nil
 	}
 
-	values, err := getDefaultValues(v)
+	err := getDefaultValues(reflect.ValueOf(v))
 	if err != nil {
 		return "", err
 	}
-	for k, v := range values {
-		query.Add(k, v)
-	}
 
 	return query.Encode(), nil
 }
 
-func isZero(v interface{}) (bool, error) {
-	t := reflect.TypeOf(v)
+func isZero(v reflect.Value) (bool, error) {
+	t := v.Elem().Type()
 	if !t.Comparable() {
 		return false, fmt.Errorf("type is not comparable: %v", t)
 	}
-	return v == reflect.Zero(t).Interface(), nil
+	return reflect.Zero(t).Equal(v.Elem()), nil
 }
 
 func TimeFromString(t *testing.T, format, datetime string) time.Time {

core_test.go

@@ -1,34 +1,56 @@
 package core
 
 import (
-	"log"
+	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
-type TestTagDefaultValueStruct struct {
-	TestString string `json:"test_string" default:"something"`
-	TestNumber int    `json:"test_number" default:"12"`
+type DefaultStructure struct {
+	EmptyField string `json:"empty_field" default:"empty_string"`
+	Field      string `json:"field" default:"string"`
 }
 
-func TestTagDefaultValue(t *testing.T) {
-	testStruct := &TestTagDefaultValueStruct{}
-
-	values, err := getDefaultValues(testStruct)
-	if err != nil {
-		log.Fatalf("error when getting default values from tags: %s", err)
-	}
-
-	expected := map[string]string{
-		"test_string": "something",
-		"test_number": "12",
-	}
-
-	if len(values) != len(expected) {
-		log.Fatalf("expected equal length of values and expected: expected: %d, got: %d", len(expected), len(values))
-	}
-	for expKey, expValue := range expected {
-		if expValue != values[expKey] {
-			log.Fatalf("not equal values for key %s", expKey)
-		}
-	}
+type DefaultRequest struct {
+	Field                  int                `json:"field" default:"100"`
+	EmptyField             int                `json:"empty_field" default:"14"`
+	Structure              DefaultStructure   `json:"structure"`
+	Slice                  []DefaultStructure `json:"slice"`
+	OptionalStructure      *DefaultStructure  `json:"optional_structure"`
+	EmptyOptionalStructure *DefaultStructure  `json:"empty_optional_structure"`
+}
+
+func TestDefaultValues(t *testing.T) {
+	req := &DefaultRequest{
+		Field: 50,
+		Structure: DefaultStructure{
+			Field: "something",
+		},
+		Slice: []DefaultStructure{
+			{
+				Field: "something",
+			},
+			{
+				Field: "something",
+			},
+		},
+		OptionalStructure: &DefaultStructure{
+			Field: "something",
+		},
+	}
+	err := getDefaultValues(reflect.ValueOf(req))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 50, req.Field)
+	assert.Equal(t, 14, req.EmptyField)
+	assert.Equal(t, "something", req.Structure.Field)
+	assert.Equal(t, "empty_string", req.Structure.EmptyField)
+	assert.Equal(t, "something", req.Slice[0].Field)
+	assert.Equal(t, "something", req.Slice[1].Field)
+	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+	assert.Equal(t, "something", req.OptionalStructure.Field)
+	assert.Equal(t, "empty_string", req.OptionalStructure.EmptyField)
+	assert.Equal(t, (*DefaultStructure)(nil), req.EmptyOptionalStructure)
 }

go.mod

@@ -1,3 +1,11 @@
 module github.com/diphantxm/ozon-api-client
 
-go 1.18
+go 1.20
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

ozon/analytics.go

@@ -20,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
@@ -31,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
@@ -95,6 +134,13 @@ type GetAnalyticsDataResultDimension struct {
 }
 
 // Specify the period and metrics that are required. The response will contain analytical data grouped by the `dimensions` parameter.
+//
+// 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"
 
@@ -119,7 +165,7 @@ type GetStocksOnWarehousesParams struct {
 	Offset int64 `json:"offset"`
 
 	// Warehouse type filter:
-	WarehouseType WarehouseType `json:"warehouse_type"`
+	WarehouseType WarehouseType `json:"warehouse_type" default:"ALL"`
 }
 
 type GetStocksOnWarehousesResponse struct {

ozon/analytics_test.go

@@ -64,8 +64,11 @@ func TestGetAnalyticsData(t *testing.T) {
 		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)
 		}
@@ -125,8 +128,11 @@ func TestGetStocksOnWarehouses(t *testing.T) {
 		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_test.go

@@ -29,7 +29,6 @@ func TestListCertifiedBrands(t *testing.T) {
 				"result": {
 				  "brand_certification": [
 					{
-					  "brand_id": 135476863,
 					  "brand_name": "Sea of Spa",
 					  "has_certificate": false
 					}
@@ -57,8 +56,11 @@ func TestListCertifiedBrands(t *testing.T) {
 		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

@@ -83,7 +83,7 @@ type CancellationInfoState struct {
 
 // Method for getting information about a rFBS cancellation request
 func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
-	url := "/v1/delivery-method/list"
+	url := "/v1/conditional-cancellation/get"
 
 	resp := &GetCancellationInfoResponse{}
 
@@ -98,17 +98,17 @@ func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoP
 
 type ListCancellationsParams struct {
 	// Filters
-	Filter ListCancellationsFilter `json:"filter"`
+	Filter *ListCancellationsFilter `json:"filter,omitempty"`
 
 	// Number of cancellation requests in the response
-	Limit int32 `json:"limit"`
+	Limit int32 `json:"limit,omitempty"`
 
 	// Number of elements that will be skipped in the response.
 	// For example, if offset=10, the response will start with the 11th element found
-	Offset int32 `json:"offset"`
+	Offset int32 `json:"offset,omitempty"`
 
 	// Additional information
-	With ListCancellationWith `json:"with"`
+	With *ListCancellationWith `json:"with,omitempty"`
 }
 
 type ListCancellationsFilter struct {
@@ -173,7 +173,7 @@ type ApproveRejectCancellationsParams struct {
 	CancellationId int64 `json:"cancellation_id"`
 
 	// Comment
-	Comment string `json:"comment"`
+	Comment string `json:"comment,omitempty"`
 }
 
 type ApproveRejectCancellationsResponse struct {

ozon/cancellations_test.go

@@ -67,8 +67,11 @@ func TestGetCancellationInfo(t *testing.T) {
 		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)
 		}
@@ -95,13 +98,13 @@ func TestListCancellations(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ListCancellationsParams{
-				Filter: ListCancellationsFilter{
+				Filter: &ListCancellationsFilter{
 					CancellationInitiator: []string{"CLIENT"},
 					State:                 "ALL",
 				},
 				Limit:  2,
 				Offset: 0,
-				With: ListCancellationWith{
+				With: &ListCancellationWith{
 					Counters: true,
 				},
 			},
@@ -123,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"
 				  },
 				  {
@@ -177,8 +180,11 @@ func TestListCancellations(t *testing.T) {
 		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)
 		}
@@ -222,8 +228,11 @@ func TestApproveCancellations(t *testing.T) {
 		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)
 		}
@@ -267,8 +276,11 @@ func TestRejectCancellations(t *testing.T) {
 		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

@@ -12,37 +12,44 @@ 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,omitempty"`
 }
 
 type GetProductTreeResponse struct {
 	core.CommonResponse
 
-	// Category list
+	// Categories list
 	Result []GetProductTreeResult `json:"result"`
 }
 
 type GetProductTreeResult struct {
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
-
-	// Subcategory tree
-	Children []GetProductTreeResponse `json:"children"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// 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
-func (c Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*GetProductTreeResponse, error) {
-	url := "/v2/category/tree"
+// We don't create new categories by user request.
+func (c *Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*GetProductTreeResponse, error) {
+	url := "/v1/description-category/tree"
 
 	resp := &GetProductTreeResponse{}
 
@@ -56,14 +63,14 @@ func (c Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*Ge
 }
 
 type GetCategoryAttributesParams struct {
-	// Filter by characteristics
-	AttributeType AttributeType `json:"attribute_type" default:"ALL"`
-
 	// Category identifier
-	CategoryId []int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	Language Language `json:"language" default:"DEFAULT"`
+	Language Language `json:"language,omitempty"`
+
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
 }
 
 type GetCategoryAttributesResponse struct {
@@ -74,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"`
 
@@ -99,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
@@ -126,17 +123,21 @@ type GetCategoryAttributesResultAttribute struct {
 
 	// Characteristic type
 	Type string `json:"type"`
+
+	// Complex attribute identifier
+	AttributeComplexId int64 `json:"attribute_complex_id"`
+
+	// Maximum number of values for attribute
+	MaxValueCount int64 `json:"max_value_count"`
 }
 
-// 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.
-//
-// You can check whether the attribute has a nested directory by the `dictionary_id` parameter.
-// The 0 value means there is no directory. If the value is different, then there are directories.
-// You can get them using the `/v2/category/attribute/values` method
-func (c Categories) Attributes(ctx context.Context, params *GetCategoryAttributesParams) (*GetCategoryAttributesResponse, error) {
-	url := "/v3/category/attribute"
+// If the dictionary_id value is 0, there is no directory.
+// If the value is different, there are directories.
+// Get them using the `/v1/description-category/attribute/values` method.
+func (c *Categories) Attributes(ctx context.Context, params *GetCategoryAttributesParams) (*GetCategoryAttributesResponse, error) {
+	url := "/v1/description-category/attribute"
 
 	resp := &GetCategoryAttributesResponse{}
 
@@ -154,42 +155,58 @@ type GetAttributeDictionaryParams struct {
 	AttributeId int64 `json:"attribute_id"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	// The default language is Russian
-	Language Language `json:"language" default:"DEFAULT"`
+	Language Language `json:"language,omitempty"`
 
+	// 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
-	Limit int64 `json:"limit"`
+	//
+	// 	- maximum—5000,
+	// 	- minimum—1.
+	Limit int64 `json:"limit,omitempty"`
+
+	// 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"`
-	Info    string `json:"info"`
+	// Characteristic value identifier
+	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.
-// If there are directories, get them using this method
-func (c Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
-	url := "/v2/category/attribute/values"
+// Returns characteristics value directory.
+//
+// To check if an attribute has a nested directory,
+// use the `/v1/description-category/attribute` method.
+func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
+	url := "/v1/description-category/attribute/values"
 
 	resp := &GetAttributeDictionaryResponse{}
 

ozon/categories_test.go

@@ -22,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,
-					"title": "Развивающие игрушки",
-					"children": []
+					"description_category_id": 0,
+					"category_name": "string",
+					"children": [],
+					"disabled": true,
+					"type_id": 0,
+					"type_name": "string"
 				  }
 				]
 			}`,
@@ -53,19 +56,14 @@ func TestGetProductTree(t *testing.T) {
 		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")
-				}
-			}
-		}
 	}
 }
 
@@ -83,25 +81,25 @@ func TestGetCategoryAttributes(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetCategoryAttributesParams{
-				CategoryId: []int64{17034410},
+				DescriptionCategoryId: 12345,
+				Language:              English,
+				TypeId:                2,
 			},
 			`{
 				"result": [
 				  {
-					"category_id": 17034410,
-					"attributes": [
-					  {
-						"id": 85,
-						"name": "Бренд",
-						"description": "Укажите наименование бренда, под которым произведен товар. Если товар не имеет бренда, используйте значение \"Нет бренда\"",
-						"type": "String",
-						"is_collection": false,
-						"is_required": true,
-						"group_id": 0,
-						"group_name": "",
-						"dictionary_id": 28732849
-					  }
-					]
+					"description": "string",
+					"dictionary_id": 0,
+					"group_id": 0,
+					"group_name": "string",
+					"id": 0,
+					"is_aspect": true,
+					"is_collection": true,
+					"is_required": true,
+					"name": "string",
+					"type": "string",
+					"attribute_complex_id": 0,
+					"max_value_count": 0
 				  }
 				]
 			}`,
@@ -125,22 +123,14 @@ func TestGetCategoryAttributes(t *testing.T) {
 		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")
-				}
-			}
-		}
 	}
 }
 
@@ -158,33 +148,23 @@ func TestGetAttributeDictionary(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetAttributeDictionaryParams{
-				AttributeId: 10096,
-				CategoryId:  17028968,
-				LastValueId: 0,
-				Limit:       3,
+				AttributeId:           123456,
+				DescriptionCategoryId: 12,
+				Language:              English,
+				LastValueId:           1,
+				Limit:                 5,
+				TypeId:                6,
 			},
 			`{
+				"has_next": true,
 				"result": [
 				  {
-					"id": 61571,
-					"value": "белый",
-					"info": "",
-					"picture": ""
-				  },
-				  {
-					"id": 61572,
-					"value": "прозрачный",
-					"info": "",
-					"picture": ""
-				  },
-				  {
-					"id": 61573,
-					"value": "бежевый",
-					"info": "",
-					"picture": ""
+					"id": 0,
+					"info": "string",
+					"picture": "string",
+					"value": "string"
 				  }
-				],
-				"has_next": true
+				]
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -206,8 +186,11 @@ func TestGetAttributeDictionary(t *testing.T) {
 		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

@@ -100,7 +100,7 @@ type ListOfCertifiedCategoriesResponse struct {
 	core.CommonResponse
 
 	// Method result
-	Result ListOfCertifiedCategoriesResult `json:"reult"`
+	Result ListOfCertifiedCategoriesResult `json:"result"`
 }
 
 type ListOfCertifiedCategoriesResult struct {
@@ -121,7 +121,7 @@ type ListOfCertifiedCategoriesResultCert struct {
 
 // List of certified categories
 func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
-	url := "/v1/product/certificate/types"
+	url := "/v1/product/certification/list"
 
 	resp := &ListOfCertifiedCategoriesResponse{}
 
@@ -233,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"`
@@ -307,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"`
@@ -316,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"`

ozon/certificates_test.go

@@ -56,8 +56,11 @@ func TestListOfAccordanceTypes(t *testing.T) {
 		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)
 		}
@@ -119,8 +122,11 @@ func TestDirectoryOfDocumentTypes(t *testing.T) {
 		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)
 		}
@@ -175,8 +181,11 @@ func TestListOfCertifiedCategories(t *testing.T) {
 		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)
 		}
@@ -223,8 +232,11 @@ func TestLinkCertificateToProduct(t *testing.T) {
 		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)
 		}
@@ -273,8 +285,11 @@ func TestDeleteCertificate(t *testing.T) {
 		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)
 		}
@@ -332,8 +347,11 @@ func TestGetCertificateInfo(t *testing.T) {
 		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)
 		}
@@ -406,8 +424,11 @@ func TestListCertificates(t *testing.T) {
 		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)
 		}
@@ -453,8 +474,11 @@ func TestProductStatuses(t *testing.T) {
 		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)
 		}
@@ -511,8 +535,11 @@ func TestListProductsForCertificate(t *testing.T) {
 		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)
 		}
@@ -565,8 +592,11 @@ func TestUnlinkFromProduct(t *testing.T) {
 		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)
 		}
@@ -612,8 +642,11 @@ func TestPossibleRejectReasons(t *testing.T) {
 		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)
 		}
@@ -659,8 +692,11 @@ func TestPossibleStatuses(t *testing.T) {
 		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)
 		}
@@ -712,8 +748,11 @@ func TestAddCertificatesForProducts(t *testing.T) {
 		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

@@ -14,14 +14,14 @@ type Chats struct {
 
 type ListChatsParams struct {
 	// Chats filter
-	Filter ListChatsFilter `json:"filter"`
+	Filter *ListChatsFilter `json:"filter,omitempty"`
 
-	// Number of values in the response. Default value is 1
-	Limit int64 `json:"limit" default:"1"`
+	// Number of values in the response. The default value is 30. The maximum value is 1000
+	Limit int64 `json:"limit" default:"30"`
 
 	// Number of elements that will be skipped in the response.
 	// For example, if offset=10, the response will start with the 11th element found
-	Offset int64 `json:"offset"`
+	Offset int64 `json:"offset,omitempty"`
 }
 
 type ListChatsFilter struct {
@@ -173,7 +173,7 @@ type ChatHistoryParams struct {
 	// Default value is the last visible message
 	FromMessageId string `json:"from_message_id"`
 
-	// Number of messages in the response. The default value is 50
+	// Number of messages in the response. The default value is 50. The maximum value is 1000
 	Limit int64 `json:"limit" default:"50"`
 }
 
@@ -240,7 +240,7 @@ type UpdateChatParams struct {
 	FromMessageId uint64 `json:"from_message_id"`
 
 	// Number of messages in the response
-	Limit int64 `json:"limit"`
+	Limit int64 `json:"limit,omitempty"`
 }
 
 type UpdateChatResponse struct {

ozon/chats_test.go

@@ -22,7 +22,7 @@ func TestListChats(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ListChatsParams{
-				Filter: ListChatsFilter{
+				Filter: &ListChatsFilter{
 					ChatStatus: "Opened",
 					UnreadOnly: true,
 				},
@@ -66,8 +66,11 @@ func TestListChats(t *testing.T) {
 		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)
 		}
@@ -125,8 +128,11 @@ func TestSendMessage(t *testing.T) {
 		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)
 		}
@@ -174,8 +180,11 @@ func TestSendFile(t *testing.T) {
 		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)
 		}
@@ -238,8 +247,11 @@ func TestChatHistory(t *testing.T) {
 		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)
 		}
@@ -305,8 +317,11 @@ func TestUpdateChat(t *testing.T) {
 		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)
 		}
@@ -354,8 +369,11 @@ func TestCreateNewChat(t *testing.T) {
 		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)
 		}
@@ -408,8 +426,11 @@ func TestMarkAsRead(t *testing.T) {
 		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

@@ -468,8 +468,10 @@ const (
 type GetFBOReturnsFilterStatus string
 
 const (
-	GetFBOReturnsFilterStatusReturnedToOzon GetFBOReturnsFilterStatus = "ReturnedToOzon"
-	GetFBOReturnsFilterStatusCancelled      GetFBOReturnsFilterStatus = "Cancelled"
+	GetFBOReturnsFilterStatusCreated                   GetFBOReturnsFilterStatus = "Created"
+	GetFBOReturnsFilterStatusReturnedToOzon            GetFBOReturnsFilterStatus = "ReturnedToOzon"
+	GetFBOReturnsFilterStatusCancelled                 GetFBOReturnsFilterStatus = "Cancelled"
+	GetFBOReturnsFilterStatusCancelledWithCompensation GetFBOReturnsFilterStatus = "CancelledWithCompensation"
 )
 
 type GetFBOReturnsReturnStatus string
@@ -540,3 +542,142 @@ const (
 	// 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

@@ -14,7 +14,7 @@ type FBO struct {
 
 type GetFBOShipmentsListParams struct {
 	// Sorting direction
-	Direction string `json:"dir"`
+	Direction string `json:"dir,omitempty"`
 
 	// Shipment search filter
 	Filter GetFBOShipmentsListFilter `json:"filter"`
@@ -23,13 +23,13 @@ type GetFBOShipmentsListParams struct {
 	Limit int64 `json:"limit"`
 
 	// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
-	Offset int64 `json:"offset"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// true if the address transliteration from Cyrillic to Latin is enabled
-	Translit bool `json:"translit"`
+	Translit bool `json:"translit,omitempty"`
 
 	// Additional fields to add to the response
-	With GetFBOShipmentsListWith `json:"with"`
+	With *GetFBOShipmentsListWith `json:"with,omitempty"`
 }
 
 // Shipment search filter
@@ -185,10 +185,10 @@ type GetShipmentDetailsParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// true if the address transliteration from Cyrillic to Latin is enabled
-	Translit bool `json:"translit"`
+	Translit bool `json:"translit,omitempty"`
 
 	// Additional fields to add to the response
-	With GetShipmentDetailsWith `json:"with"`
+	With *GetShipmentDetailsWith `json:"with,omitempty"`
 }
 
 type GetShipmentDetailsWith struct {
@@ -248,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"`
@@ -323,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"`
@@ -353,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"`

ozon/fbo_test.go

@@ -31,7 +31,7 @@ func TestGetFBOShipmentsList(t *testing.T) {
 				Limit:    5,
 				Offset:   0,
 				Translit: true,
-				With: GetFBOShipmentsListWith{
+				With: &GetFBOShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 				},
@@ -44,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",
-					"in_process_at": "2021-09-01T00:25:30.120000Z",
+					"created_at": "2021-09-01T00:23:45.607Z",
+					"in_process_at": "2021-09-01T00:25:30.12Z",
 					"products": [
 					  {
 						"sku": 160249683,
@@ -138,8 +138,11 @@ func TestGetFBOShipmentsList(t *testing.T) {
 		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)
 		}
@@ -162,7 +165,7 @@ func TestGetShipmentDetails(t *testing.T) {
 			&GetShipmentDetailsParams{
 				PostingNumber: "50520644-0012-7",
 				Translit:      true,
-				With: GetShipmentDetailsWith{
+				With: &GetShipmentDetailsWith{
 					AnalyticsData: true,
 					FinancialData: true,
 				},
@@ -267,8 +270,11 @@ func TestGetShipmentDetails(t *testing.T) {
 		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)
 		}
@@ -346,8 +352,11 @@ func TestListSupplyRequests(t *testing.T) {
 		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)
 		}
@@ -422,8 +431,11 @@ func TestGetSupplyRequestInfo(t *testing.T) {
 		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)
 		}
@@ -481,8 +493,11 @@ func TestListProductsInSupplyRequest(t *testing.T) {
 		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)
 		}
@@ -540,8 +555,11 @@ func TestGetWarehouseWorkload(t *testing.T) {
 		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

@@ -14,7 +14,7 @@ type FBS struct {
 
 type ListUnprocessedShipmentsParams struct {
 	// Sorting direction
-	Direction Order `json:"dir"`
+	Direction Order `json:"dir,omitempty"`
 
 	// Request filter
 	Filter ListUnprocessedShipmentsFilter `json:"filter"`
@@ -27,10 +27,10 @@ type ListUnprocessedShipmentsParams struct {
 
 	// Number of elements that will be skipped in the response.
 	// For example, if `offset` = 10, the response will start with the 11th element found
-	Offset int64 `json:"offset"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// Additional fields that should be added to the response
-	With ListUnprocessedShipmentsWith `json:"with"`
+	With *ListUnprocessedShipmentsWith `json:"with,omitempty"`
 }
 
 type ListUnprocessedShipmentsFilter struct {
@@ -306,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
@@ -408,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"`
@@ -511,9 +511,9 @@ func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocess
 
 type GetFBSShipmentsListParams struct {
 	// Sorting direction
-	Direction string `json:"direction"`
+	Direction string `json:"dir,omitempty"`
 
-	//Filter
+	// Filter
 	Filter GetFBSShipmentsListFilter `json:"filter"`
 
 	// Number of shipments in the response:
@@ -522,10 +522,10 @@ type GetFBSShipmentsListParams struct {
 	Limit int64 `json:"limit"`
 
 	// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
-	Offset int64 `json:"offset"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// Additional fields that should be added to the response
-	With GetFBSShipmentsListWith `json:"with"`
+	With *GetFBSShipmentsListWith `json:"with,omitempty"`
 }
 
 type GetFBSShipmentsListFilter struct {
@@ -625,7 +625,7 @@ type PackOrderParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// Additional information
-	With PackOrderWith `json:"with"`
+	With *PackOrderWith `json:"with,omitempty"`
 }
 
 type PackOrderPackage struct {
@@ -865,7 +865,7 @@ type GetShipmentDataByIdentifierParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// Additional fields that should be added to the response
-	With GetShipmentDataByIdentifierWith `json:"with"`
+	With *GetShipmentDataByIdentifierWith `json:"with,omitempty"`
 }
 
 type GetShipmentDataByIdentifierWith struct {
@@ -910,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"`
@@ -925,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"`
@@ -1118,20 +1118,39 @@ 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
@@ -1244,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"`
@@ -1731,18 +1750,76 @@ func (c FBS) GetDropOffPointRestrictions(ctx context.Context, params *GetDropOff
 }
 
 type CheckProductItemsDataParams struct {
+	// Quantity of boxes the product is packed in
+	MultiBoxQuantity int32 `json:"multi_box_qty"`
+
 	// Shipment number
 	PostingNumber string `json:"posting_number"`
 
-	Products CheckProductItemsDataProduct `json:"products"`
+	// Product list
+	Products []CheckProductItemsDataProduct `json:"products"`
 }
 
 type CheckProductItemsDataProduct struct {
 	// Product items data
-	Exemplars []FBSProductExemplar `json:"exemplars"`
+	Exemplars []CheckProductItemsDataProductExemplar `json:"exemplars"`
 
-	// SKU, FBS product identifier in the Ozon system
+	// Indication that you need to pass the сustoms cargo declaration
+	// (CCD) number for the product and shipment
+	IsGTDNeeded bool `json:"is_gtd_needed"`
+
+	// Indication that you need to pass the "Chestny ZNAK" labeling
+	IsMandatoryMarkNeeded bool `json:"is_mandatory_mark_needed"`
+
+	// Indication that you need to pass the product batch registration number
+	IsRNPTNeeded bool `json:"is_rnpt_needed"`
+
+	// Product ID
 	ProductId int64 `json:"product_id"`
+
+	// Items quantity
+	Quantity int32 `json:"quantity"`
+}
+
+type CheckProductItemsDataProductExemplar struct {
+	// Item identifier
+	ExemplarId int64 `json:"exemplar_id"`
+
+	// Customs cargo declaration (CCD) number
+	GTD string `json:"gtd"`
+
+	// Сustoms cargo declaration (CCD) check status
+	GTDCheckStatus string `json:"gtd_check_status"`
+
+	// Сustoms cargo declaration (CCD) check error codes
+	GTDErrorCodes []string `json:"gtd_error_codes"`
+
+	// Indication that the customs cargo declaration (CCD) number isn't specified
+	IsGTDAbsent bool `json:"is_gtd_absent"`
+
+	// "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"`
+
+	// Indication that the product batch registration number isn't specified
+	IsRNPTAbsent bool `json:"is_rnpt_absent"`
+
+	// Mandatory "Chestny ZNAK" labeling
+	MandatoryMark string `json:"mandatory_mark"`
+
+	// Product batch registration number
+	RNPT string `json:"rnpt"`
+
+	// Product batch registration number check status
+	RNPTCheckStatus string `json:"rnpt_check_status"`
+
+	// Product batch registration number check error codes
+	RNPTErrorCodes []string `json:"rnpt_error_codes"`
+
+	// Unique identifier of charges of the jewelry
+	JWUIN string `json:"jw_uin"`
 }
 
 type CheckProductItemsDataResponse struct {
@@ -1753,21 +1830,24 @@ type CheckProductItemsDataResponse struct {
 }
 
 // Asynchronous method:
-//   - for checking the availability of product items in the “Chestny ZNAK” labeling system
-//   - for saving product items data
 //
-// To get the checks results, use the `/v4/fbs/posting/product/exemplar/status method`
+// for checking the availability of product items in the “Chestny ZNAK” labeling system;
+// for saving product items data.
+// To get the checks results, use the `/v4/fbs/posting/product/exemplar/status` method.
+// To get data about created items, use the `/v5/fbs/fbs/posting/product/exemplar/create-or-get` method.
 //
-// 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
+// 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.
 //
-// If you have multiple identical products in a shipment, specify one `product_id` and `exemplars` array for each product in the shipment
+// If you have multiple identical products in a shipment, specify one `product_id` and exemplars array for each product in the shipment.
 //
-// # Always pass a complete set of product items data
+// Always pass a complete set of product items data.
 //
 // 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(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
+// You've passed them for checking and saving.
+// Then you 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(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
 	url := "/v4/fbs/posting/product/exemplar/set"
 
 	resp := &CheckProductItemsDataResponse{}
@@ -1977,8 +2057,8 @@ type PartialPackOrderParams struct {
 }
 
 type PartialPackOrderProduct struct {
-	// Data array on product items
-	ExemplarInfo []FBSProductExemplar `json:"exemplar_info"`
+	// Product item identifiers
+	ExemplarIds []string `json:"exemplarIds"`
 
 	// FBS product identifier in the Ozon system, SKU
 	ProductId int64 `json:"product_id"`
@@ -1990,11 +2070,8 @@ type PartialPackOrderProduct struct {
 type PartialPackOrderResponse struct {
 	core.CommonResponse
 
-	// Additional data about shipments
-	AdditionalData []PartialPackOrderAdditionalData `json:"additional_data"`
-
-	// Identifiers of shipments that were created after package
-	Result []string `json:"result"`
+	// Shipments numbers formed after packaging
+	Result string `json:"result"`
 }
 
 type PartialPackOrderAdditionalData struct {
@@ -2010,7 +2087,7 @@ type PartialPackOrderAdditionalData struct {
 //
 // The status of the original shipment will only change when the split shipments status changes
 func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
-	url := "/v3/posting/fbs/ship/package"
+	url := "/v4/posting/fbs/ship/package"
 
 	resp := &PartialPackOrderResponse{}
 
@@ -2466,7 +2543,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"`
@@ -2772,3 +2849,36 @@ func (c FBS) GetActPDF(ctx context.Context, params *GetActPDFParams) (*GetActPDF
 
 	return resp, nil
 }
+
+type CreateOrGetProductExemplarParams struct {
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+}
+
+type CreateOrGetProductExemplarResponse struct {
+	core.CommonResponse
+
+	// Quantity of boxes the product is packed in
+	MultiBoxQuantity int32 `json:"multi_box_qty"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Product list
+	Products []CheckProductItemsDataProduct `json:"products"`
+}
+
+// Method returns the created items data passed in the `/v5/fbs/posting/product/exemplar/set` method.
+func (c FBS) CreateOrGetProductExemplar(ctx context.Context, params *CreateOrGetProductExemplarParams) (*CreateOrGetProductExemplarResponse, error) {
+	url := "/v5/fbs/posting/product/exemplar/create-or-get"
+
+	resp := &CreateOrGetProductExemplarResponse{}
+
+	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
+}

ozon/fbs_test.go

@@ -29,7 +29,7 @@ func TestListUnprocessedShipments(t *testing.T) {
 					Status:     "awaiting_packaging",
 				},
 				Limit: 100,
-				With: ListUnprocessedShipmentsWith{
+				With: &ListUnprocessedShipmentsWith{
 					AnalyticsData: true,
 					Barcodes:      true,
 					FinancialData: true,
@@ -172,8 +172,11 @@ func TestListUnprocessedShipments(t *testing.T) {
 		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)
 		}
@@ -196,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"),
-					To:     core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-12-01T23:59:59.000Z"),
-					Status: "awaiting_packaging",
+					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"),
+					Status:           "awaiting_packaging",
+					WarehouseId:      []int64{123},
+					ProviderId:       []int64{223},
+					FBPFilter:        FBPFilterAll,
+					DeliveryMethodId: []int64{456},
+					OrderId:          0,
 				},
-				Limit:  100,
+				Limit:  0,
 				Offset: 0,
-				With: GetFBSShipmentsListWith{
+				With: &GetFBSShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 					Translit:      true,
+					Barcodes:      true,
 				},
 			},
 			`{
@@ -216,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 Логистика самостоятельно, Красногорск",
@@ -284,8 +294,11 @@ func TestGetFBSShipmentsList(t *testing.T) {
 		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)
 		}
@@ -317,7 +330,7 @@ func TestPackOrder(t *testing.T) {
 					},
 				},
 				PostingNumber: "89491381-0072-1",
-				With: PackOrderWith{
+				With: &PackOrderWith{
 					AdditionalData: true,
 				},
 			},
@@ -346,8 +359,11 @@ func TestPackOrder(t *testing.T) {
 		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)
 		}
@@ -424,8 +440,11 @@ func TestValidateLabelingCodes(t *testing.T) {
 		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)
 		}
@@ -465,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",
@@ -497,25 +493,12 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
 					  "name": "Кофе ароматизированный \"Шоколадный апельсин\" 250 гр",
 					  "sku": 180550365,
 					  "quantity": 1,
-					  "mandatory_mark": [],
-					  "dimensions": {
-						"height": "40.00",
-						"length": "240.00",
-						"weight": "260",
-						"width": "140.00"
-					  }
+					  "mandatory_mark": []
 					}
 				  ],
 				  "barcodes": null,
 				  "analytics_data": null,
-				  "financial_data": null,
-				  "additional_data": [],
-				  "is_express": false,
-				  "requirements": {
-					"products_requiring_gtd": [],
-					"products_requiring_country": []
-				  },
-				  "product_exemplars": null
+				  "financial_data": null
 				}
 			}`,
 		},
@@ -538,8 +521,11 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
 		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)
 		}
@@ -570,7 +556,7 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetShipmentDataByIdentifierParams{
 				PostingNumber: "57195475-0050-3",
-				With:          GetShipmentDataByIdentifierWith{},
+				With:          &GetShipmentDataByIdentifierWith{},
 			},
 			`{
 				"result": {
@@ -652,8 +638,11 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
 		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)
 		}
@@ -725,8 +714,11 @@ func TestAddTrackingNumbers(t *testing.T) {
 		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)
 		}
@@ -819,8 +811,11 @@ func TestListOfShipmentCertificates(t *testing.T) {
 		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)
 		}
@@ -881,8 +876,11 @@ func TestSignShipmentCertificate(t *testing.T) {
 		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)
 		}
@@ -957,24 +955,30 @@ func TestChangeStatusTo(t *testing.T) {
 		deliveringResp, err := c.FBS().ChangeStatusToDelivering(deliveringctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
+		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
 		}
 
 		deliveredctx, _ := context.WithTimeout(context.Background(), testTimeout)
 		deliveredResp, err := c.FBS().ChangeStatusToDelivered(deliveredctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		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)
@@ -1023,8 +1027,11 @@ func TestPassShipmentToShipping(t *testing.T) {
 		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)
 		}
@@ -1072,8 +1079,11 @@ func TestCancelShipment(t *testing.T) {
 		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)
 		}
@@ -1123,8 +1133,11 @@ func TestCreateAct(t *testing.T) {
 		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)
 		}
@@ -1173,8 +1186,11 @@ func TestGetLabeling(t *testing.T) {
 		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)
 		}
@@ -1227,8 +1243,11 @@ func TestPrintLabeling(t *testing.T) {
 		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)
 		}
@@ -1282,8 +1301,11 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
 		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)
 		}
@@ -1343,8 +1365,11 @@ func TestGetDropOffPointRestrictions(t *testing.T) {
 		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)
 		}
@@ -1370,15 +1395,27 @@ func TestCheckProductItemsData(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&CheckProductItemsDataParams{
-				PostingNumber: "48173252-0034-4",
-				Products: CheckProductItemsDataProduct{
-					Exemplars: []FBSProductExemplar{
-						{
-							IsGTDAbsest:   true,
-							MandatoryMark: "010290000151642731tVMohkbfFgunB",
+				MultiBoxQuantity: 0,
+				PostingNumber:    "1234",
+				Products: []CheckProductItemsDataProduct{
+					{
+						Exemplars: []CheckProductItemsDataProductExemplar{
+							{
+								ExemplarId:    1,
+								GTD:           "string",
+								IsGTDAbsent:   true,
+								IsRNPTAbsent:  true,
+								MandatoryMark: "string",
+								RNPT:          "string",
+								JWUIN:         "string",
+							},
 						},
+						IsGTDNeeded:           true,
+						IsMandatoryMarkNeeded: true,
+						IsRNPTNeeded:          true,
+						ProductId:             22,
+						Quantity:              11,
 					},
-					ProductId: 476925391,
 				},
 			},
 			`{
@@ -1401,11 +1438,14 @@ func TestCheckProductItemsData(t *testing.T) {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
 		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.FBS().CheckproductItemsData(ctx, test.params)
+		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)
 		}
@@ -1468,8 +1508,11 @@ func TestGetProductItemsCheckStatuses(t *testing.T) {
 		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)
 		}
@@ -1537,8 +1580,11 @@ func TestRescheduleShipmentDeliveryDate(t *testing.T) {
 		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)
 		}
@@ -1589,8 +1635,11 @@ func TestDateAvailableForDeliverySchedule(t *testing.T) {
 		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)
 		}
@@ -1649,8 +1698,11 @@ func TestListManufactoruingCountries(t *testing.T) {
 		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)
 		}
@@ -1710,8 +1762,11 @@ func TestSetManufacturingCountry(t *testing.T) {
 		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)
 		}
@@ -1741,22 +1796,15 @@ func TestPartialPackOrder(t *testing.T) {
 				PostingNumber: "48173252-0034-4",
 				Products: []PartialPackOrderProduct{
 					{
-						ExemplarInfo: []FBSProductExemplar{
-							{
-								MandatoryMark: "mark",
-								GTD:           "gtd",
-								IsGTDAbsest:   true,
-							},
-						},
-						ProductId: 247508873,
-						Quantity:  1,
+						ExemplarIds: []string{"string"},
+						ProductId:   247508873,
+						Quantity:    1,
 					},
 				},
 			},
-			`{
-				"result": [
-				  "48173252-0034-9"
-				]
+			`
+			{
+				"result": "48173252-0034-9"
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -1778,8 +1826,11 @@ func TestPartialPackOrder(t *testing.T) {
 		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)
 		}
@@ -1851,8 +1902,11 @@ func TestAvailableFreightsList(t *testing.T) {
 		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)
 		}
@@ -1899,8 +1953,11 @@ func TestGenerateAct(t *testing.T) {
 		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)
 		}
@@ -1949,8 +2006,11 @@ func TestGetDigitalAct(t *testing.T) {
 		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)
 		}
@@ -2004,8 +2064,11 @@ func TestPackageUnitLabels(t *testing.T) {
 		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)
 		}
@@ -2057,8 +2120,11 @@ func TestOpenDisputeOverShipment(t *testing.T) {
 		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)
 		}
@@ -2125,8 +2191,11 @@ func TestShipmentCancellationReasons(t *testing.T) {
 		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)
 		}
@@ -2221,8 +2290,11 @@ func TestShipmentsCancellationReasons(t *testing.T) {
 		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)
 		}
@@ -2283,8 +2355,11 @@ func TestAddWeightForBulkProduct(t *testing.T) {
 		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)
 		}
@@ -2344,8 +2419,11 @@ func TestCancelSending(t *testing.T) {
 		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)
 		}
@@ -2410,8 +2488,11 @@ func TestListShipmentInCertificate(t *testing.T) {
 		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)
 		}
@@ -2459,8 +2540,11 @@ func TestSpecifyNumberOfBoxes(t *testing.T) {
 		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)
 		}
@@ -2485,7 +2569,13 @@ func TestStatusOfAct(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "result": true
+				  "added_to_act": [
+					"true"
+				  ],
+				  "removed_from_act": [
+					"false"
+				  ],
+				  "status": "ready"
 				}
 			}`,
 		},
@@ -2508,8 +2598,11 @@ func TestStatusOfAct(t *testing.T) {
 		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)
 		}
@@ -2567,8 +2660,11 @@ func TestETGBCustomsDeclarations(t *testing.T) {
 		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)
 		}
@@ -2616,8 +2712,11 @@ func TestBarcodeFromProductShipment(t *testing.T) {
 		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)
 		}
@@ -2675,8 +2774,11 @@ func TestBarcodeValueFromProductShipment(t *testing.T) {
 		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)
 		}
@@ -2730,8 +2832,11 @@ func TestGetActPDF(t *testing.T) {
 		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)
 		}
@@ -2743,3 +2848,74 @@ func TestGetActPDF(t *testing.T) {
 		}
 	}
 }
+
+func TestCreateOrGetProductExemplar(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateOrGetProductExemplarParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateOrGetProductExemplarParams{
+				PostingNumber: "string",
+			},
+			`{
+				"multi_box_qty": 0,
+				"posting_number": "string",
+				"products": [
+				  {
+					"exemplars": [
+					  {
+						"exemplar_id": 0,
+						"gtd": "string",
+						"is_gtd_absent": true,
+						"is_rnpt_absent": true,
+						"mandatory_mark": "string",
+						"rnpt": "string",
+						"jw_uin": "string"
+					  }
+					],
+					"is_gtd_needed": true,
+					"is_mandatory_mark_needed": true,
+					"is_rnpt_needed": true,
+					"product_id": 0,
+					"quantity": 0
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateOrGetProductExemplarParams{},
+			`{
+				"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.FBS().CreateOrGetProductExemplar(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateOrGetProductExemplarResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/finance.go

@@ -21,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"`
@@ -211,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"`
@@ -272,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"`

ozon/finance_test.go

@@ -26,53 +26,49 @@ func TestReportOnSoldProducts(t *testing.T) {
 				Date: "2022-09",
 			},
 			`{
-				"result": [
-					{
-						"header": [
-							{
-								"doc_date": "2022-09-22",
-								"num": "string",
-								"start_date": "2022-09-02",
-								"stop_date": "2022-09-22",
-								"contract_date": "2022-09-02",
-								"contract_num": "string",
-								"payer_name": "string",
-								"payer_inn": "string",
-								"payer_kpp": "string",
-								"rcv_name": "string",
-								"rcv_inn": "string",
-								"rcv_kpp": "string",
-								"doc_amount": 1,
-								"vat_amount": 1,
-								"currency_code": "string"
-							}
-						],
-						"rows": [
-							{
-								"row_number": 0,
-								"product_id": 0,
-								"product_name": "string",
-								"offer_id": "string",
-								"barcode": "string",
-								"price": 0,
-								"commission_percent": 0,
-								"price_sale": 0,
-								"sale_qty": 0,
-								"sale_amount": 0,
-								"sale_discount": 0,
-								"sale_commission": 0,
-								"sale_price_seller": 0,
-								"return_sale": 0,
-								"return_qty": 0,
-								"return_amount": 0,
-								"return_discount": 0,
-								"return_commission": 0,
-								"return_price_seller": 0
-							}
-						]
-					}
-				]
-			}`,
+                "result": {
+                    "header": {
+                        "doc_date": "2022-09-22",
+                        "num": "string",
+                        "start_date": "2022-09-02",
+                        "stop_date": "2022-09-22",
+                        "contract_date": "2022-09-02",
+                        "contract_num": "string",
+                        "payer_name": "string",
+                        "payer_inn": "string",
+                        "payer_kpp": "string",
+                        "rcv_name": "string",
+                        "rcv_inn": "string",
+                        "rcv_kpp": "string",
+                        "doc_amount": 1,
+                        "vat_amount": 1,
+                        "currency_code": "string"
+                    },
+                    "rows": [
+                    {
+                        "row_number": 0,
+                        "product_id": 0,
+                        "product_name": "string",
+                        "offer_id": "string",
+                        "barcode": "string",
+                        "price": 0,
+                        "commission_percent": 0,
+                        "price_sale": 0,
+                        "sale_qty": 0,
+                        "sale_amount": 0,
+                        "sale_discount": 0,
+                        "sale_commission": 0,
+                        "sale_price_seller": 0,
+                        "return_sale": 0,
+                        "return_qty": 0,
+                        "return_amount": 0,
+                        "return_discount": 0,
+                        "return_commission": 0,
+                        "return_price_seller": 0
+                    }
+                    ]
+                }
+            }`,
 			"",
 		},
 		// Test No Client-Id or Api-Key
@@ -95,8 +91,11 @@ func TestReportOnSoldProducts(t *testing.T) {
 		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)
 		}
@@ -164,8 +163,11 @@ func TestGetTotalTransactionsSum(t *testing.T) {
 		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)
 		}
@@ -253,8 +255,11 @@ func TestListTransactions(t *testing.T) {
 		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_test.go

@@ -53,8 +53,11 @@ func TestCreateUpdateProformaLink(t *testing.T) {
 		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)
 		}
@@ -102,8 +105,11 @@ func TestGetProformaLink(t *testing.T) {
 		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)
 		}
@@ -149,8 +155,11 @@ func TestDeleteProformaLink(t *testing.T) {
 		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_test.go

@@ -626,12 +626,14 @@ func TestNotificationServerErrors(t *testing.T) {
 		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{}{}
@@ -640,16 +642,19 @@ func TestNotificationServerErrors(t *testing.T) {
 		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
 		}
 	}
 }

ozon/ozon.go

@@ -10,6 +10,15 @@ const (
 	DefaultAPIBaseUrl = "https://api-seller.ozon.ru"
 )
 
+type ClientOptions struct {
+	client core.HttpClient
+
+	baseUri string
+
+	apiKey   string
+	clientId string
+}
+
 type Client struct {
 	client *core.Client
 
@@ -31,6 +40,7 @@ type Client struct {
 	chats         *Chats
 	certificates  *Certificates
 	strategies    *Strategies
+	barcodes      *Barcodes
 }
 
 func (c Client) Analytics() *Analytics {
@@ -105,10 +115,50 @@ func (c Client) Strategies() *Strategies {
 	return c.strategies
 }
 
-func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
-	coreClient := core.NewClient(httpClient, DefaultAPIBaseUrl, map[string]string{
-		"Client-Id": clientId,
-		"Api-Key":   apiKey,
+func (c Client) Barcodes() *Barcodes {
+	return c.barcodes
+}
+
+type ClientOption func(c *ClientOptions)
+
+func WithHttpClient(httpClient core.HttpClient) ClientOption {
+	return func(c *ClientOptions) {
+		c.client = httpClient
+	}
+}
+
+func WithURI(uri string) ClientOption {
+	return func(c *ClientOptions) {
+		c.baseUri = uri
+	}
+}
+
+func WithClientId(clientId string) ClientOption {
+	return func(c *ClientOptions) {
+		c.clientId = clientId
+	}
+}
+
+func WithAPIKey(apiKey string) ClientOption {
+	return func(c *ClientOptions) {
+		c.apiKey = apiKey
+	}
+}
+
+func NewClient(opts ...ClientOption) *Client {
+	// default values
+	options := &ClientOptions{
+		client:  http.DefaultClient,
+		baseUri: DefaultAPIBaseUrl,
+	}
+
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	coreClient := core.NewClient(options.client, options.baseUri, map[string]string{
+		"Client-Id": options.clientId,
+		"Api-Key":   options.apiKey,
 	})
 
 	return &Client{
@@ -131,6 +181,7 @@ func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
+		barcodes:      &Barcodes{client: coreClient},
 	}
 }
 
@@ -157,5 +208,6 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
+		barcodes:      &Barcodes{client: coreClient},
 	}
 }

ozon/ozon_test.go

@@ -0,0 +1,27 @@
+package ozon
+
+import (
+	"net/http"
+	"testing"
+)
+
+const (
+	apiKey   = "some_key"
+	clientId = "some_client_id"
+)
+
+func TestNewClient(t *testing.T) {
+	client := NewClient(
+		WithAPIKey(apiKey),
+		WithClientId(clientId),
+		WithURI(DefaultAPIBaseUrl),
+		WithHttpClient(http.DefaultClient),
+	)
+
+	if client.client.Options["Api-Key"] != apiKey {
+		t.Errorf("expected api key: %s, but got: %s", apiKey, client.client.Options["Api-Key"])
+	}
+	if client.client.Options["Client-Id"] != clientId {
+		t.Errorf("expected client id: %s, but got: %s", clientId, client.client.Options["Client-Id"])
+	}
+}

ozon/polygons.go

@@ -85,27 +85,3 @@ func (c Polygons) Link(ctx context.Context, params *LinkDeliveryMethodToPolygonP
 
 	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(ctx context.Context, params *DeletePolygonParams) (*DeletePolygonResponse, error) {
-	url := "/v1/polygon/delete"
-
-	resp := &DeletePolygonResponse{}
-
-	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
-}

ozon/polygons_test.go

@@ -25,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
@@ -47,8 +47,11 @@ func TestCreateDeliveryPolygon(t *testing.T) {
 		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)
 		}
@@ -102,52 +105,10 @@ func TestLinkDeliveryMethodToPolygon(t *testing.T) {
 		resp, err := c.Polygons().Link(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)
-		}
-	}
-}
-
-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))
-
-		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Polygons().Delete(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-		}
+
+		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

@@ -16,13 +16,13 @@ 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 {
@@ -40,42 +40,42 @@ 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:
@@ -112,7 +112,7 @@ type GetProductDetailsResponse struct {
 	core.CommonResponse
 
 	// Request results
-	Result ProductDetails `json:"Result"`
+	Result ProductDetails `json:"result"`
 }
 
 type ProductDetails struct {
@@ -128,7 +128,10 @@ type ProductDetails struct {
 	BuyboxPrice string `json:"buybox_price"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
+
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
 
 	// Marketing color
 	ColorImage string `json:"color_image"`
@@ -142,6 +145,12 @@ type ProductDetails struct {
 	// Product SKU
 	SKU int64 `json:"sku"`
 
+	// SKU of the product that is sold from the Ozon warehouse (FBO)
+	FBOSKU int64 `json:"fbo_sku,omitempty"`
+
+	// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
+	FBSSKU int64 `json:"fbs_sku,omitempty"`
+
 	// Document generation task number
 	Id int64 `json:"id"`
 
@@ -210,12 +219,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"`
@@ -242,7 +251,7 @@ type ProductDetails struct {
 	Visible bool `json:"visible"`
 
 	// Product volume weight
-	VolumeWeight float64 `json:"volume_weights"`
+	VolumeWeight float64 `json:"volume_weight"`
 }
 
 type ProductDetailCommission struct {
@@ -276,7 +285,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 {
@@ -374,6 +383,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
@@ -381,6 +392,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 {
@@ -420,6 +434,9 @@ type GetProductDetailsResponseItemError struct {
 }
 
 // Get product details
+//
+// 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"
 
@@ -556,7 +573,7 @@ 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(ctx context.Context, params *UpdateQuantityStockProductsParams) (*UpdateQuantityStockProductsResponse, error) {
@@ -641,12 +658,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
@@ -721,7 +750,7 @@ type CreateOrUpdateProductItem struct {
 	Barcode string `json:"barcode"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Marketing color.
 	//
@@ -868,7 +897,7 @@ type CreateOrUpdateProductResult struct {
 
 // This method allows you to create products and update their details
 func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
-	url := "/v2/product/import"
+	url := "/v3/product/import"
 
 	resp := &CreateOrUpdateProductResponse{}
 
@@ -1135,6 +1164,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"`
 
@@ -1323,10 +1356,10 @@ type GetDescriptionOfProductParams struct {
 	Limit int64 `json:"limit"`
 
 	// The parameter by which the products will be sorted
-	SortBy string `json:"sort_by"`
+	SortBy string `json:"sort_by,omitempty"`
 
 	// Sorting direction
-	SortDirection string `json:"sort_direction"`
+	SortDirection string `json:"sort_dir,omitempty"`
 }
 
 type GetDescriptionOfProductFilter struct {
@@ -1363,7 +1396,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"`
@@ -1585,7 +1618,7 @@ func (c Products) GetProductRangeLimit(ctx context.Context) (*GetProductRangeLim
 
 	resp := &GetProductRangeLimitResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, &struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1913,7 +1946,7 @@ type GetPRoductPriceInfoResultItem struct {
 	Commissions GetProductPriceInfoResultItemCommission `json:"commissions"`
 
 	// Promotions information
-	MarketingActions []GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
+	MarketingActions *GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
 
 	// Seller product identifier
 	OfferId string `json:"offer_id"`
@@ -1927,7 +1960,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"`
@@ -1971,7 +2004,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"`
@@ -2069,7 +2102,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 {
@@ -2106,6 +2139,10 @@ type GetProductPriceInfoResultItemPriceIndexesSelfMarketplace struct {
 }
 
 // You can specify up to 1000 products in the request
+//
+// 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"
 
@@ -2145,7 +2182,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"`
@@ -2316,3 +2353,64 @@ func (c Products) UpdateCharacteristics(ctx context.Context, params *UpdateChara
 
 	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
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}

ozon/products_test.go

@@ -75,8 +75,11 @@ func TestGetStocksInfo(t *testing.T) {
 		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)
 		}
@@ -124,7 +127,7 @@ func TestGetProductDetails(t *testing.T) {
 					"7533900005"
 				  ],
 				  "buybox_price": "",
-				  "category_id": 17038062,
+				  "type_id": 0,
 				  "created_at": "2021-10-21T15:48:03.529178Z",
 				  "images": [
 					"https://cdn1.ozone.ru/s3/multimedia-5/6088931525.jpg",
@@ -138,6 +141,7 @@ func TestGetProductDetails(t *testing.T) {
 					"reserved": 0
 				  },
 				  "currency_code": "RUB",
+				  "description_category_id": 12,
 				  "marketing_price": "",
 				  "min_price": "",
 				  "old_price": "",
@@ -161,7 +165,6 @@ func TestGetProductDetails(t *testing.T) {
 					"present": 0,
 					"reserved": 0
 				  },
-				  "errors": [],
 				  "updated_at": "2023-02-09T06:46:44.152Z",
 				  "vat": "0.0",
 				  "visible": false,
@@ -273,8 +276,11 @@ func TestGetProductDetails(t *testing.T) {
 		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)
 		}
@@ -286,7 +292,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 == "" {
@@ -348,8 +354,11 @@ func TestUpdateStocks(t *testing.T) {
 		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)
 		}
@@ -418,8 +427,11 @@ func TestStocksInSellersWarehouse(t *testing.T) {
 		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)
 		}
@@ -493,8 +505,11 @@ func TestUpdatePrices(t *testing.T) {
 		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)
 		}
@@ -566,8 +581,11 @@ func TestUpdateQuantityStockProducts(t *testing.T) {
 		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)
 		}
@@ -658,21 +676,21 @@ func TestCreateOrUpdateProduct(t *testing.T) {
 								},
 							},
 						},
-						Barcode:       "112772873170",
-						CategoryId:    17033876,
-						CurrencyCode:  "RUB",
-						Depth:         10,
-						DimensionUnit: "mm",
-						Height:        250,
-						Name:          "Комплект защитных плёнок для X3 NFC. Темный хлопок",
-						OfferId:       "143210608",
-						OldPrice:      "1100",
-						PremiumPrice:  "900",
-						Price:         "1000",
-						VAT:           "0.1",
-						Weight:        100,
-						WeightUnit:    "g",
-						Width:         150,
+						Barcode:               "112772873170",
+						DescriptionCategoryId: 17033876,
+						CurrencyCode:          "RUB",
+						Depth:                 10,
+						DimensionUnit:         "mm",
+						Height:                250,
+						Name:                  "Комплект защитных плёнок для X3 NFC. Темный хлопок",
+						OfferId:               "143210608",
+						OldPrice:              "1100",
+						PremiumPrice:          "900",
+						Price:                 "1000",
+						VAT:                   "0.1",
+						Weight:                100,
+						WeightUnit:            "g",
+						Width:                 150,
 					},
 				},
 			},
@@ -701,8 +719,11 @@ func TestCreateOrUpdateProduct(t *testing.T) {
 		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)
 		}
@@ -769,8 +790,11 @@ func TestGetListOfProducts(t *testing.T) {
 		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)
 		}
@@ -1016,8 +1040,11 @@ func TestGetProductsRatingBySKU(t *testing.T) {
 		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)
 		}
@@ -1084,8 +1111,11 @@ func TestGetProductImportStatus(t *testing.T) {
 		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)
 		}
@@ -1156,8 +1186,11 @@ func TestCreateProductByOzonID(t *testing.T) {
 		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)
 		}
@@ -1225,8 +1258,11 @@ func TestUpdateProductImages(t *testing.T) {
 		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)
 		}
@@ -1294,8 +1330,11 @@ func TestCheckImageUploadingStatus(t *testing.T) {
 		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)
 		}
@@ -1339,7 +1378,8 @@ func TestListProductsByIDs(t *testing.T) {
 						"7533900005"
 					  ],
 					  "buybox_price": "",
-					  "category_id": 93726157,
+					  "description_category_id": 93726157,
+					  "type_id": 0,
 					  "created_at": "2021-06-03T03:40:05.871465Z",
 					  "images": [],
 					  "has_discounted_item": true,
@@ -1368,13 +1408,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,
@@ -1384,7 +1422,24 @@ func TestListProductsByIDs(t *testing.T) {
 						"active_product": false,
 						"reasons": {}
 					  },
-					  "price_index": "0.00",
+					  "price_indexes": {
+						"external_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						},
+						"ozon_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						},
+						"price_index": "WITHOUT_INDEX",
+						"self_marketplaces_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						}
+					  },
 					  "images360": [],
 					  "is_kgt": false,
 					  "color_image": "",
@@ -1410,7 +1465,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": "",
@@ -1431,13 +1485,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,
@@ -1490,8 +1542,11 @@ func TestListProductsByIDs(t *testing.T) {
 		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)
 		}
@@ -1536,7 +1591,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,
@@ -1698,8 +1753,7 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 					  }
 					],
 					"complex_attributes": [],
-					"color_image": "",
-					"last_id": ""
+					"color_image": ""
 				  }
 				],
 				"total": 1,
@@ -1725,8 +1779,11 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 		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)
 		}
@@ -1784,8 +1841,11 @@ func TestGetProductDescription(t *testing.T) {
 		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)
 		}
@@ -1848,8 +1908,11 @@ func TestGetProductRangeLimit(t *testing.T) {
 		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)
 		}
@@ -1905,8 +1968,11 @@ func TestChangeProductIDs(t *testing.T) {
 		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)
 		}
@@ -1952,8 +2018,11 @@ func TestArchiveProduct(t *testing.T) {
 		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)
 		}
@@ -1999,8 +2068,11 @@ func TestUnarchiveProduct(t *testing.T) {
 		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)
 		}
@@ -2056,8 +2128,11 @@ func TestRemoveProductWithoutSKU(t *testing.T) {
 		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)
 		}
@@ -2134,8 +2209,11 @@ func TestListGeoRestrictions(t *testing.T) {
 		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)
 		}
@@ -2184,8 +2262,11 @@ func TestUploadActivationCodes(t *testing.T) {
 		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)
 		}
@@ -2233,8 +2314,11 @@ func TestStatusOfUploadingActivationCodes(t *testing.T) {
 		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)
 		}
@@ -2347,8 +2431,11 @@ func TestGetProductPriceInfo(t *testing.T) {
 		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)
 		}
@@ -2410,6 +2497,7 @@ func TestGetMarkdownInfo(t *testing.T) {
 		resp, err := c.Products().GetMarkdownInfo(ctx, test.params)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -2417,6 +2505,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")
@@ -2466,11 +2556,14 @@ func TestSetDiscountOnMarkdownProduct(t *testing.T) {
 		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{})
 	}
 }
 
@@ -2518,12 +2611,15 @@ func TestNumberOfSubsToProductAvailability(t *testing.T) {
 		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")
@@ -2593,10 +2689,82 @@ func TestUpdateCharacteristics(t *testing.T) {
 		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

@@ -52,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"`
@@ -154,7 +154,7 @@ type ProductsAvailableForPromotionParams struct {
 
 	// Number of elements that will be skipped in the response.
 	// For example, if offset=10, the response will start with the 11th element found
-	Offset float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsAvailableForPromotionResponse struct {
@@ -183,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"`
@@ -218,14 +218,14 @@ type ProductsInPromotionParams struct {
 	Limit float64 `json:"limit"`
 
 	// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
-	Offset float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsInPromotionResponse struct {
 	core.CommonResponse
 
 	// Method result
-	Result ProductsInPromotionResult `json:"reuslt"`
+	Result ProductsInPromotionResult `json:"result"`
 }
 
 type ProductsInPromotionResult struct {
@@ -355,7 +355,7 @@ type ProductsAvailableForHotSalePromotionParams struct {
 	Limit float64 `json:"limit"`
 
 	// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
-	Offset float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsAvailableForHotSalePromotionResponse struct {
@@ -387,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"`

ozon/promotions_test.go

@@ -61,8 +61,11 @@ func TestGetAvailablePromotions(t *testing.T) {
 		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)
 		}
@@ -131,8 +134,11 @@ func TestAddToPromotion(t *testing.T) {
 		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)
 		}
@@ -208,8 +214,11 @@ func TestProductsAvailableForPromotion(t *testing.T) {
 		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)
 		}
@@ -270,8 +279,11 @@ func TestProductsInPromotion(t *testing.T) {
 		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)
 		}
@@ -323,8 +335,11 @@ func TestRemoveProduct(t *testing.T) {
 		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)
 		}
@@ -383,8 +398,11 @@ func TestListHotSalePromotions(t *testing.T) {
 		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)
 		}
@@ -445,8 +463,11 @@ func TestProductsAvailableForHotSalePromotion(t *testing.T) {
 		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)
 		}
@@ -506,8 +527,11 @@ func TestAddProductsToHotSale(t *testing.T) {
 		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)
 		}
@@ -561,8 +585,11 @@ func TestRemoveProductsToHotSale(t *testing.T) {
 		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)
 		}
@@ -648,8 +675,11 @@ func TestListDiscountRequests(t *testing.T) {
 		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)
 		}
@@ -712,8 +742,11 @@ func TestApproveDiscountRequest(t *testing.T) {
 		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)
 		}
@@ -776,8 +809,11 @@ func TestDeclineDiscountRequest(t *testing.T) {
 		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

@@ -17,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 {
@@ -25,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 {

ozon/rating_test.go

@@ -63,8 +63,11 @@ func TestGetCurrentRatingInfo(t *testing.T) {
 		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)
 		}
@@ -152,8 +155,11 @@ func TestGetRatingInfoForPeriod(t *testing.T) {
 		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

@@ -61,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
@@ -126,21 +129,11 @@ type GetReportDetailResult struct {
 	// Array with the filters specified when the seller created the report
 	Params map[string]string `json:"params"`
 
-	// Report type:
-	//   - SELLER_PRODUCTS — products report,
-	//   - 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 type
+	ReportType ReportType `json:"report_type"`
 
-	// Report generation status:
-	//   - success
-	//   - failed
-	Status string `json:"status"`
+	// Report generation status
+	Status ReportInfoStatus `json:"status"`
 }
 
 // Returns information about a created report by its identifier
@@ -203,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"`
@@ -455,89 +448,9 @@ func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParam
 	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(ctx context.Context, params *GetStocksReportParams) (*GetStocksReportResponse, error) {
-	url := "/v1/report/stock/create"
-
-	resp := &GetStocksReportResponse{}
-
-	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 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(ctx context.Context, params *GetProductsMovementReportParams) (*GetProductsMovementReportResponse, error) {
-	url := "/v1/report/products/movement/create"
-
-	resp := &GetProductsMovementReportResponse{}
-
-	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 GetReturnsReportParams struct {
 	// Filter
-	Filter GetReturnsReportsFilter `json:"filter"`
+	Filter *GetReturnsReportsFilter `json:"filter,omitempty"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -565,7 +478,7 @@ 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"`
 }
 
@@ -588,7 +501,7 @@ func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams)
 
 type GetShipmentReportParams struct {
 	// Filter
-	Filter GetShipmentReportFilter `json:"filter"`
+	Filter *GetShipmentReportFilter `json:"filter,omitempty"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -601,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
@@ -686,56 +602,34 @@ func (c Reports) IssueOnDiscountedProducts(ctx context.Context) (*IssueOnDiscoun
 	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 {
-	core.CommonResponse
+// Report with information about the number of available and reserved products in stock.
+//
+// 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
-	Report ReportonDiscountedProductsReport `json:"report"`
-}
-
-type ReportonDiscountedProductsReport struct {
-	// 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(ctx context.Context, params *ReportOnDiscountedProductsParams) (*ReportOnDiscountedProductsResponse, error) {
-	url := "/v1/report/discounted/info"
-
-	resp := &ReportOnDiscountedProductsResponse{}
-
-	response, err := c.client.Request(ctx, 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(ctx context.Context) (*ReportOnDiscountedProductsResponse, error) {
-	url := "/v1/report/discounted/list"
-
-	resp := &ReportOnDiscountedProductsResponse{}
+	resp := &GetFBSStocksResponse{}
 
 	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {

ozon/reports_test.go

@@ -74,8 +74,11 @@ func TestGetList(t *testing.T) {
 		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)
 		}
@@ -113,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"
 				}
 			}`,
 		},
@@ -136,8 +139,11 @@ func TestGetReportDetails(t *testing.T) {
 		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)
 		}
@@ -258,8 +264,7 @@ func TestGetFinancialReport(t *testing.T) {
 					},
 					"end_balance_amount": 0
 				  }
-				},
-				"page_count": 15
+				}
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -281,8 +286,11 @@ func TestGetFinancialReport(t *testing.T) {
 		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)
 		}
@@ -336,116 +344,10 @@ func TestGetProductsReport(t *testing.T) {
 		resp, err := c.Reports().GetProducts(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)
-		}
-
-		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))
-
-		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Reports().GetStocks(ctx, 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))
-
-		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Reports().GetProductsMovement(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-		}
+		compareJsonResponse(t, test.response, &GetProductsReportResponse{})
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
@@ -473,7 +375,7 @@ func TestGetReturnsReport(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetReturnsReportParams{
-				Filter: GetReturnsReportsFilter{
+				Filter: &GetReturnsReportsFilter{
 					DeliverySchema: "fbs",
 				},
 			},
@@ -502,8 +404,11 @@ func TestGetReturnsReport(t *testing.T) {
 		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)
 		}
@@ -530,7 +435,7 @@ func TestGetShipmentReport(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetShipmentReportParams{
-				Filter: GetShipmentReportFilter{
+				Filter: &GetShipmentReportFilter{
 					DeliverySchema:  []string{"fbs", "fbo", "crossborder"},
 					ProcessedAtFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"),
 					ProcessedAtTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"),
@@ -561,8 +466,11 @@ func TestGetShipmentReport(t *testing.T) {
 		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)
 		}
@@ -609,6 +517,7 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 		resp, err := c.Reports().IssueOnDiscountedProducts(ctx)
 		if err != nil {
 			t.Error(err)
+			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -616,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")
 			}
@@ -623,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{
-				Code: "d55f4517-8347-4e24-9d93-d6e736c1c07c",
+			&GetFBSStocksParams{
+				Language:     "EN",
+				WarehouseIds: []int64{123},
 			},
 			`{
-				"report": {
-				  "created_at": "2022-10-04T10:07:08.146Z",
-				  "error": "string",
-				  "file": "string",
-				  "status": "string"
+				"result": {
+					"code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
 				}
 			}`,
 		},
@@ -652,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"
@@ -664,60 +572,14 @@ func TestReportOnDiscountedProducts(t *testing.T) {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
 		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Reports().ReportOnDiscountedProducts(ctx, 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)
-		}
-	}
-}
-
-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))
-
-		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Reports().ListReportsOnDiscountedProducts(ctx)
+		resp, err := c.Reports().GetFBSStocks(ctx, test.params)
 		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

@@ -14,7 +14,7 @@ type Returns struct {
 
 type GetFBOReturnsParams struct {
 	// Filter
-	Filter GetFBOReturnsFilter `json:"filter"`
+	Filter *GetFBOReturnsFilter `json:"filter,omitempty"`
 
 	// Identifier of the last value on the page. Leave this field blank in the first request.
 	//
@@ -95,7 +95,7 @@ func (c Returns) GetFBOReturns(ctx context.Context, params *GetFBOReturnsParams)
 
 type GetFBSReturnsParams struct {
 	// Filter
-	Filter GetFBSReturnsFilter `json:"filter"`
+	Filter *GetFBSReturnsFilter `json:"filter,omitempty"`
 
 	// Number of values in the response:
 	//   - maximum — 1000,
@@ -161,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"`
@@ -261,3 +261,617 @@ func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams)
 
 	return resp, nil
 }
+
+type GetRFBSReturnsParams struct {
+	// Filter
+	Filter *GetRFBSReturnsFilter `json:"filter,omitempty"`
+
+	// 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, nil, 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, nil, 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, nil, 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, nil, 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, nil, 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, nil, 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, nil, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}

ozon/returns_test.go

@@ -22,7 +22,7 @@ func TestGetFBOReturns(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetFBOReturnsParams{
-				Filter: GetFBOReturnsFilter{
+				Filter: &GetFBOReturnsFilter{
 					PostingNumber: "some number",
 				},
 				LastId: 123,
@@ -66,8 +66,11 @@ func TestGetFBOReturns(t *testing.T) {
 		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)
 		}
@@ -102,7 +105,7 @@ func TestGetFBSReturns(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetFBSReturnsParams{
-				Filter: GetFBSReturnsFilter{
+				Filter: &GetFBSReturnsFilter{
 					PostingNumber: []string{"07402477-0022-2"},
 					Status:        "returned_to_seller",
 				},
@@ -165,8 +168,11 @@ func TestGetFBSReturns(t *testing.T) {
 		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)
 		}
@@ -189,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

@@ -24,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"`
@@ -32,10 +32,10 @@ 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
@@ -74,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"`

ozon/strategies_test.go

@@ -54,8 +54,11 @@ func TestListCompetitors(t *testing.T) {
 		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)
 		}
@@ -114,8 +117,11 @@ func TestListStrategies(t *testing.T) {
 		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)
 		}
@@ -158,7 +164,7 @@ func TestCreateStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
+				  "strategy_id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
 				}
 			}`,
 		},
@@ -181,8 +187,11 @@ func TestCreateStrategy(t *testing.T) {
 		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)
 		}
@@ -207,7 +216,7 @@ func TestInfoStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "strategy_name": "test1",
+				  "name": "test1",
 				  "enabled": true,
 				  "update_type": "strategyItemsListChanged",
 				  "type": "COMP_PRICE",
@@ -243,8 +252,11 @@ func TestInfoStrategy(t *testing.T) {
 		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)
 		}
@@ -311,8 +323,11 @@ func TestUpdateStrategy(t *testing.T) {
 		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)
 		}
@@ -361,8 +376,11 @@ func TestAddProductsToStrategy(t *testing.T) {
 		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)
 		}
@@ -415,8 +433,11 @@ func TestGetStrategiesByProductIds(t *testing.T) {
 		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)
 		}
@@ -478,8 +499,11 @@ func TestListProductsInStrategy(t *testing.T) {
 		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)
 		}
@@ -532,8 +556,11 @@ func TestGetCompetitorPrice(t *testing.T) {
 		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)
 		}
@@ -581,8 +608,11 @@ func TestRemoveProductsFromStrategy(t *testing.T) {
 		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)
 		}
@@ -627,8 +657,11 @@ func TestChangeStrategyStatus(t *testing.T) {
 		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)
 		}
@@ -672,8 +705,11 @@ func TestRemoveStrategy(t *testing.T) {
 		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

@@ -102,7 +102,7 @@ func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehous
 
 type GetListOfDeliveryMethodsParams struct {
 	// Search filter for delivery methods
-	Filter GetListOfDeliveryMethodsFilter `json:"filter"`
+	Filter *GetListOfDeliveryMethodsFilter `json:"filter,omitempty"`
 
 	// Number of items in a response. Maximum is 50, minimum is 1
 	Limit int64 `json:"limit"`
@@ -181,7 +181,7 @@ func (c Warehouses) GetListOfDeliveryMethods(ctx context.Context, params *GetLis
 
 	resp := &GetListOfDeliveryMethodsResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/warehouses_test.go

@@ -63,8 +63,11 @@ func TestGetListOfWarehouses(t *testing.T) {
 		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)
 		}
@@ -96,7 +99,7 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetListOfDeliveryMethodsParams{
-				Filter: GetListOfDeliveryMethodsFilter{
+				Filter: &GetListOfDeliveryMethodsFilter{
 					WarehouseId: 15588127982000,
 				},
 				Limit:  100,
@@ -139,8 +142,11 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 		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)
 		}