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

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"reflect"
 )
 
 type HttpClient interface {
@@ -36,6 +37,14 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 }
 
 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
@@ -62,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 {

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

@@ -165,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/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

@@ -98,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,
 				},
 			},

ozon/categories.go

@@ -13,7 +13,7 @@ type Categories struct {
 
 type GetProductTreeParams struct {
 	// Response language
-	Language Language `json:"language"`
+	Language Language `json:"language,omitempty"`
 }
 
 type GetProductTreeResponse struct {
@@ -67,7 +67,7 @@ type GetCategoryAttributesParams struct {
 	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	Language Language `json:"language"`
+	Language Language `json:"language,omitempty"`
 
 	// Product type identifier
 	TypeId int64 `json:"type_id"`
@@ -158,7 +158,7 @@ type GetAttributeDictionaryParams struct {
 	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	Language Language `json:"language"`
+	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
@@ -168,7 +168,7 @@ type GetAttributeDictionaryParams struct {
 	//
 	// 	- maximum—5000,
 	// 	- minimum—1.
-	Limit int64 `json:"limit"`
+	Limit int64 `json:"limit,omitempty"`
 
 	// Product type identifier
 	TypeId int64 `json:"type_id"`

ozon/certificates.go

@@ -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{}
 

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. 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 {
@@ -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,
 				},

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

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 {

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,
 				},
@@ -165,7 +165,7 @@ func TestGetShipmentDetails(t *testing.T) {
 			&GetShipmentDetailsParams{
 				PostingNumber: "50520644-0012-7",
 				Translit:      true,
-				With: GetShipmentDetailsWith{
+				With: &GetShipmentDetailsWith{
 					AnalyticsData: true,
 					FinancialData: true,
 				},

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 {
@@ -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 {

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,
@@ -210,7 +210,7 @@ func TestGetFBSShipmentsList(t *testing.T) {
 				},
 				Limit:  0,
 				Offset: 0,
-				With: GetFBSShipmentsListWith{
+				With: &GetFBSShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 					Translit:      true,
@@ -330,7 +330,7 @@ func TestPackOrder(t *testing.T) {
 					},
 				},
 				PostingNumber: "89491381-0072-1",
-				With: PackOrderWith{
+				With: &PackOrderWith{
 					AdditionalData: true,
 				},
 			},
@@ -556,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": {

ozon/products.go

@@ -27,13 +27,13 @@ type GetStocksInfoParams struct {
 
 type GetStocksInfoFilter struct {
 	// Filter by the offer_id parameter. It is possible to pass a list of values
-	OfferId string `json:"offer_id"`
+	OfferId string `json:"offer_id,omitempty"`
 
 	// Filter by the product_id parameter. It is possible to pass a list of values
-	ProductId int64 `json:"product_id"`
+	ProductId int64 `json:"product_id,omitempty"`
 
 	// Filter by product visibility
-	Visibility string `json:"visibility"`
+	Visibility string `json:"visibility,omitempty"`
 }
 
 type GetStocksInfoResponse struct {
@@ -145,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"`
 
@@ -1350,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 {
@@ -1612,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
 	}
@@ -1940,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"`

ozon/promotions.go

@@ -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 {
@@ -218,7 +218,7 @@ 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 {
@@ -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 {

ozon/reports.go

@@ -450,7 +450,7 @@ func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParam
 
 type GetReturnsReportParams struct {
 	// Filter
-	Filter GetReturnsReportsFilter `json:"filter"`
+	Filter *GetReturnsReportsFilter `json:"filter,omitempty"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -501,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:

ozon/reports_test.go

@@ -375,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",
 				},
 			},
@@ -435,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"),

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,
@@ -264,7 +264,7 @@ func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams)
 
 type GetRFBSReturnsParams struct {
 	// Filter
-	Filter GetRFBSReturnsFilter `json:"filter"`
+	Filter *GetRFBSReturnsFilter `json:"filter,omitempty"`
 
 	// Identifier of the last value on the page.
 	// Leave this field blank in the first request
@@ -667,7 +667,7 @@ func (c Returns) IsGiveoutEnabled(ctx context.Context) (*IsGiveoutEnabledRespons
 
 	resp := &IsGiveoutEnabledResponse{}
 
-	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
 	}
@@ -697,7 +697,7 @@ func (c Returns) GetGiveoutPDF(ctx context.Context) (*GetGiveoutResponse, error)
 
 	resp := &GetGiveoutResponse{}
 
-	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
 	}
@@ -714,7 +714,7 @@ func (c Returns) GetGiveoutPNG(ctx context.Context) (*GetGiveoutResponse, error)
 
 	resp := &GetGiveoutResponse{}
 
-	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
 	}
@@ -739,7 +739,7 @@ func (c Returns) GetGiveoutBarcode(ctx context.Context) (*GetGiveoutBarcodeRespo
 
 	resp := &GetGiveoutBarcodeResponse{}
 
-	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
 	}
@@ -758,7 +758,7 @@ func (c Returns) ResetGiveoutBarcode(ctx context.Context) (*GetGiveoutResponse,
 
 	resp := &GetGiveoutResponse{}
 
-	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
 	}
@@ -814,7 +814,7 @@ func (c Returns) GetGiveoutList(ctx context.Context, params *GetGiveoutListParam
 
 	resp := &GetGiveoutListResponse{}
 
-	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
 	}
@@ -867,7 +867,7 @@ func (c Returns) GetGiveoutInfo(ctx context.Context, params *GetGiveoutInfoParam
 
 	resp := &GetGiveoutInfoResponse{}
 
-	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
 	}

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,
@@ -105,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",
 				},
@@ -212,7 +212,7 @@ func TestGetRFBSReturns(t *testing.T) {
 			&GetRFBSReturnsParams{
 				LastId: 999,
 				Limit:  555,
-				Filter: GetRFBSReturnsFilter{
+				Filter: &GetRFBSReturnsFilter{
 					OfferId:       "123",
 					PostingNumber: "111",
 					GroupState:    []RFBSReturnsGroupState{RFBSReturnsGroupStateAll},

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

@@ -99,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,