added comments on restrictions for seller without Premium subscription

.github/workflows/tests.yml

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

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

ENDPOINTS.md

@@ -0,0 +1,177 @@
+# Supported Endpoints
+
+## Ozon attributes and characteristics
+- [x] Product category tree
+- [x] Category characteristics list
+- [x] Characteristics value directory
+
+## Uploading and updating products
+- [x] Create or update a product
+- [x] Get the product import status
+- [x] Create a product by Ozon ID
+- [x] Upload and update product images
+- [x] Check products images uploading status
+- [x] List of products
+- [x] Product details
+- [x] Get products' content rating by SKU
+- [x] Get a list of products by identifiers
+- [x] Get a description of the product characteristics
+- [x] Get product description
+- [x] Product range limit, limits on product creation and update
+- [x] Change product identifiers from the seller's system
+- [x] Archive a product
+- [x] Unarchive a product
+- [x] Remove a product without an SKU from the archive
+- [x] Get a list of geo-restrictions for services
+- [x] Upload activation codes for services and digital products
+- [x] Status of uploading activation codes
+
+## Prices and Stocks
+- [x] Update stocks
+- [x] Update the quantity of products in stock
+- [x] Information about product quantity
+- [x] Stocks in seller's warehouses (FBS и rFBS)
+- [x] Update prices
+- [x] Get product price information
+- [x] Get information about the markdown and the main product by the markdown product SKU
+- [x] Set a discount on a markdown product
+
+## Promotions
+- [x] Available promotions
+- [x] Products that can participate in a promotion
+- [x] Products in a promotion
+- [x] Add products to promotion
+- [x] Remove products from promotion
+- [x] List of available Hot Sale promotions
+- [x] List of products participating in the Hot Sale promotion
+- [x] Add products to the Hot Sale promotion
+- [x] Remove product from the Hot Sale promotion
+- [x] List of discount requests
+- [x] Approve a discount request
+- [x] Decline a discount request
+
+## Brand certificates
+- [x] List of certified brands
+
+## Quality certificates
+- [x] List of accordance types (version 2)
+- [x] Directory of document types
+- [x] List of certified categories
+- [x] Adding certificates for products
+- [x] Link the certificate to the product
+- [x] Delete certificate
+- [x] Certificate information
+- [x] Certificates list
+- [x] Product statuses list
+- [x] List of products associated with the certificate
+- [x] Unbind products from a certificate
+- [x] Possible certificate rejection reasons
+- [x] Possible certificate statuses
+
+## Warehouses
+- [x] List of warehouses
+- [x] List of delivery methods for a warehouse
+
+## Polygons
+- [x] Create delivery polygon
+- [x] Link delivery method to a delivery polygon
+- [x] Delete polygon
+
+## FBO
+- [x] Shipments list
+- [x] Shipment details
+
+## FBS and rFBS products labeling
+- [x] Validate labeling codes
+- [x] Check and save product items data
+- [x] Get product items check statuses
+- [x] Pack the order (version 4)
+
+## FBS and rFBS
+- [x] List of unprocessed shipments (version 3)
+- [x] Shipments list (version 3)
+- [x] Get shipment details by identifier (version 3)
+- [x] Get shipment data by barcode
+- [x] List of manufacturing countries
+- [x] Set the manufacturing country
+- [x] Specify number of boxes for multi-box shipments
+- [x] Get drop-off point restrictions
+- [x] Partial pack the order
+- [x] Create an acceptance and transfer certificate and a waybill
+- [x] Status of acceptance and transfer certificate and waybill
+- [x] Available freights list
+- [x] Get acceptance and transfer certificate and waybill
+- [x] Generating status of digital acceptance and transfer certificate and waybill
+- [x] Get digital shipment certificate
+- [x] Print the labeling
+- [x] Create a task to generate labeling
+- [x] Get a labeling file
+- [x] Package unit labels
+- [x] Open a dispute over a shipment
+- [x] Pass the shipment to shipping
+- [x] Shipment cancellation reasons
+- [x] Shipments cancellation reasons
+- [x] Cancel the shipment
+- [x] Add weight for bulk products in a shipment
+- [x] Cancel sending some products in the shipment
+- [x] List of shipment certificates
+- [x] Sign shipment certificates
+- [x] List of shipments in the certificate
+- [x] Change the status to "Delivering"
+- [x] Add tracking numbers
+- [x] Change the status to "Last Mile"
+- [x] Change the status to "Delivered"
+- [x] Change status to "Sent by seller"
+- [x] Dates available for delivery reschedule
+- [x] Reschedule shipment delivery date
+- [x] ETGB customs declarations
+
+## Returns
+- [x] Get information about FBO returns (version 3)
+- [x] Get information about FBS returns
+
+## Cancellations
+- [x] Get information about a rFBS cancellation request
+- [x] Get a list of rFBS cancellation requests
+- [x] Approve a rFBS cancellation request
+- [x] Reject a rFBS cancellation request
+
+## Chats with customers
+- [x] Chats list
+- [x] Send message
+- [x] Send file
+- [x] Chat history
+- [x] Update chat
+- [x] Create a new chat
+- [x] Mark messages as read
+
+## Invoices
+- [x] Create or edit proforma invoice link
+- [x] Get a proforma invoice link
+- [x] Delete the proforma invoice link
+
+## Reports
+- [x] Report details
+- [x] Reports list
+- [x] Products report
+- [x] Stocks report
+- [x] Report on products movement
+- [x] Returns report
+- [x] Shipment report
+- [x] Financial report
+- [x] Issue a report on discounted products
+- [x] Report on discounted products
+- [x] List of reports on discounted products
+
+## Analytics
+- [x] Analytics data
+- [x] Stocks and products report (version 2)
+
+## Finance
+- [x] Report on sold products
+- [x] Transactions list (version 3)
+- [x] Total transactions sum
+
+## Seller rating
+- [x] Get information on current seller ratings
+- [x] Get information on seller ratings for the period

README.md

@@ -2,44 +2,42 @@
 A Ozon Seller API client written in Golang
 
 [![Coverage Status](https://coveralls.io/repos/github/diPhantxm/ozon-api-client/badge.svg)](https://coveralls.io/github/diPhantxm/ozon-api-client)
-![example workflow](https://git.denco.store/fakz9/ozon-api-client/actions/workflows/tests.yml/badge.svg)
+![example workflow](https://github.com/diPhantxm/ozon-api-client/actions/workflows/tests.yml/badge.svg)
 
 [Ozon](https://ozon.ru) is a marketplace for small and medium enterprises to launch and grow their businesses in Russia.
 
 Read full [documentation](https://docs.ozon.ru/api/seller/en/#tag/Introduction)
 
+You can check [list of supported endpoints](ENDPOINTS.md)
+
 ## How to start
 ### API
 Get Client-Id and Api-Key in your seller profile [here](https://seller.ozon.ru/app/settings/api-keys?locale=en)
 
 Just add dependency to your project and you're ready to go.
 ```bash
-go get git.denco.store/fakz9/ozon-api-client
+go get github.com/diphantxm/ozon-api-client
 ```
 A simple example on how to use this library:
 ```Golang
 package main
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net/http"
 
-	"git.denco.store/fakz9/ozon-api-client/ozon"
+	"github.com/diphantxm/ozon-api-client/ozon"
 )
 
 func main() {
 	// Create a client with your Client-Id and Api-Key
 	// [Documentation]: https://docs.ozon.ru/api/seller/en/#tag/Auth
-	opts := []ozon.ClientOption{
+	client := ozon.NewClient("my-client-id", "my-api-key")
-		ozon.WithAPIKey("api-key"),
-		ozon.WithClientId("client-id"),
-	}
-	c := ozon.NewClient(opts...)
 
 	// Send request with parameters
-	resp, err := client.Products().GetProductDetails(context.Background(), &ozon.GetProductDetailsParams{
+	ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
 		ProductId: 123456789,
 	})
 	if err != nil || resp.StatusCode != http.StatusOK {
@@ -65,7 +63,7 @@ package main
 import (
 	"log"
 
-	"git.denco.store/fakz9/ozon-api-client/ozon/notifications"
+	"github.com/diphantxm/ozon-api-client/ozon/notifications"
 )
 
 func main() {
@@ -89,3 +87,8 @@ func main() {
 	}
 }
 ```
+
+## Contribution
+If you need some endpoints ASAP, create an issue and list all the endpoints. I will add them to library soon.
+
+Or you can implement them and contribute to the project. Contribution to the project is welcome. 

client.go

@@ -7,8 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"net/url"
-	"reflect"
 )
 
 type HttpClient interface {
@@ -36,28 +34,14 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 	}
 }
 
-func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
+func (c Client) newRequest(ctx context.Context, method string, url string, body interface{}) (*http.Request, error) {
-	var err error
+	bodyJson, err := json.Marshal(body)
-	var bodyJson []byte
-
-	// 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
-		}
-	}
-
-	uri, err = url.JoinPath(c.baseUrl, uri)
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequestWithContext(ctx, method, uri, bytes.NewBuffer(bodyJson))
+
+	url = c.baseUrl + url
+	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(bodyJson))
 	if err != nil {
 		return nil, err
 	}
@@ -74,6 +58,11 @@ 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,7 +66,6 @@ func TestRequest(t *testing.T) {
 
 		if err != nil {
 			t.Error(err)
-			continue
 		}
 
 		if resp.StatusCode != test.statusCode {

core.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"reflect"
-	"strconv"
-	"strings"
 	"testing"
 	"time"
 )
@@ -34,103 +32,51 @@ func (r Response) CopyCommonResponse(rhs *CommonResponse) {
 	rhs.Message = r.Message
 }
 
-func getDefaultValues(v reflect.Value) error {
+func getDefaultValues(v interface{}) (map[string]string, error) {
-	vValue := v.Elem()
+	isNil, err := isZero(v)
-	vType := vValue.Type()
+	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()
 
 	for i := 0; i < vType.NumField(); i++ {
 		field := vType.Field(i)
+		tag := field.Tag.Get("json")
+		defaultValue := field.Tag.Get("default")
 
-		switch field.Type.Kind() {
+		if field.Type.Kind() == reflect.Slice {
-		case reflect.Slice:
+			// Attach any slices as query params
-			for j := 0; j < vValue.Field(i).Len(); j++ {
+			fieldVal := vValue.Field(i)
-				// skip if slice type is primitive
+			for j := 0; j < fieldVal.Len(); j++ {
-				if vValue.Field(i).Index(j).Kind() != reflect.Struct {
+				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 == "" {
 					continue
 				}
 
-				// Attach any slices as query params
+				fieldVal = defaultValue
-				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
 			}
 
-			defaultValue, ok := field.Tag.Lookup("default")
+			out[tag] = fmt.Sprintf("%v", fieldVal)
-			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 nil
+	return out, nil
 }
 
 func buildRawQuery(req *http.Request, v interface{}) (string, error) {
@@ -140,20 +86,23 @@ func buildRawQuery(req *http.Request, v interface{}) (string, error) {
 		return query.Encode(), nil
 	}
 
-	err := getDefaultValues(reflect.ValueOf(v))
+	values, err := getDefaultValues(v)
 	if err != nil {
 		return "", err
 	}
+	for k, v := range values {
+		query.Add(k, v)
+	}
 
 	return query.Encode(), nil
 }
 
-func isZero(v reflect.Value) (bool, error) {
+func isZero(v interface{}) (bool, error) {
-	t := v.Elem().Type()
+	t := reflect.TypeOf(v)
 	if !t.Comparable() {
 		return false, fmt.Errorf("type is not comparable: %v", t)
 	}
-	return reflect.Zero(t).Equal(v.Elem()), nil
+	return v == reflect.Zero(t).Interface(), nil
 }
 
 func TimeFromString(t *testing.T, format, datetime string) time.Time {
@@ -163,44 +112,3 @@ func TimeFromString(t *testing.T, format, datetime string) time.Time {
 	}
 	return dt
 }
-
-const ShortDateLayout = "2006-01-02"
-
-// Do not use this structure for responses
-// as there are no ways to unmarshal to any layout
-// and leave nil if json field is null
-type TimeFormat struct {
-	time.Time
-	layout string
-}
-
-func NewTimeFormat(t time.Time, layout string) *TimeFormat {
-	return &TimeFormat{
-		Time:   t,
-		layout: layout,
-	}
-}
-
-func newTimeLayout(layout string) *TimeFormat {
-	return &TimeFormat{
-		layout: layout,
-	}
-}
-
-func (rd *TimeFormat) UnmarshalJSON(b []byte) error {
-	var err error
-
-	s := strings.Trim(string(b), `"`) // remove quotes
-
-	// Added for extra accuracy
-	// encoding/json won't invoke this method if field is null
-	if s == "null" {
-		return nil
-	}
-	rd.Time, err = time.Parse(rd.layout, s)
-	return err
-}
-
-func (rd *TimeFormat) MarshalJSON() ([]byte, error) {
-	return []byte(fmt.Sprintf(`%q`, rd.Time.Format(rd.layout))), nil
-}

core_test.go

@@ -1,152 +1,34 @@
 package core
 
 import (
-	"encoding/json"
+	"log"
-	"reflect"
 	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
 )
 
-type DefaultStructure struct {
+type TestTagDefaultValueStruct struct {
-	EmptyField string `json:"empty_field" default:"empty_string"`
+	TestString string `json:"test_string" default:"something"`
-	Field      string `json:"field" default:"string"`
+	TestNumber int    `json:"test_number" default:"12"`
 }
 
-type DefaultRequest struct {
+func TestTagDefaultValue(t *testing.T) {
-	Field                  int                `json:"field" default:"100"`
+	testStruct := &TestTagDefaultValueStruct{}
-	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) {
+	values, err := getDefaultValues(testStruct)
-	req := &DefaultRequest{
+	if err != nil {
-		Field: 50,
+		log.Fatalf("error when getting default values from tags: %s", err)
-		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)
+	expected := map[string]string{
-	assert.Equal(t, 14, req.EmptyField)
+		"test_string": "something",
-	assert.Equal(t, "something", req.Structure.Field)
+		"test_number": "12",
-	assert.Equal(t, "empty_string", req.Structure.EmptyField)
+	}
-	assert.Equal(t, "something", req.Slice[0].Field)
+
-	assert.Equal(t, "something", req.Slice[1].Field)
+	if len(values) != len(expected) {
-	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+		log.Fatalf("expected equal length of values and expected: expected: %d, got: %d", len(expected), len(values))
-	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+	}
-	assert.Equal(t, "something", req.OptionalStructure.Field)
+	for expKey, expValue := range expected {
-	assert.Equal(t, "empty_string", req.OptionalStructure.EmptyField)
+		if expValue != values[expKey] {
-	assert.Equal(t, (*DefaultStructure)(nil), req.EmptyOptionalStructure)
+			log.Fatalf("not equal values for key %s", expKey)
-}
+		}
-
+	}
-func TestTimeFormat(t *testing.T) {
-	t.Run("Time Format Marshalling", func(t *testing.T) {
-		tests := []struct {
-			ft           *TimeFormat
-			layout       string
-			expectedJSON string
-			diff         time.Duration
-		}{
-			{
-				ft:           NewTimeFormat(time.Date(2024, 4, 30, 15, 42, 12, 55, time.FixedZone("Test Zone", 0)), ShortDateLayout),
-				layout:       ShortDateLayout,
-				expectedJSON: `"2024-04-30"`,
-				diff:         time.Hour * 24,
-			},
-			{
-				ft:           NewTimeFormat(time.Date(2024, 4, 30, 0, 0, 0, 0, time.FixedZone("Test Zone", 0)), ShortDateLayout),
-				layout:       ShortDateLayout,
-				expectedJSON: `"2024-04-30"`,
-				diff:         time.Hour * 24,
-			},
-			{
-				ft:           NewTimeFormat(time.Time{}, ShortDateLayout),
-				layout:       ShortDateLayout,
-				expectedJSON: `"0001-01-01"`,
-				diff:         time.Hour * 24,
-			},
-			{
-				ft:           nil,
-				layout:       ShortDateLayout,
-				expectedJSON: `null`,
-				diff:         time.Hour * 24,
-			},
-		}
-
-		for _, tc := range tests {
-			marshaled, err := json.Marshal(tc.ft)
-			assert.Equal(t, nil, err)
-			assert.Equal(t, tc.expectedJSON, string(marshaled))
-
-			unmarshaled := newTimeLayout(tc.layout)
-			err = json.Unmarshal(marshaled, unmarshaled)
-			assert.Equal(t, nil, err)
-
-			if tc.ft != nil {
-				diffedTime := tc.ft.Add(-tc.diff)
-				assert.Equal(t, true, diffedTime.Before(unmarshaled.Time) || diffedTime.Equal(unmarshaled.Time))
-				assert.Equal(t, true, tc.ft.After(unmarshaled.Time) || tc.ft.Equal(unmarshaled.Time))
-			}
-		}
-	})
-
-	t.Run("Time Format in structure Marshalling", func(t *testing.T) {
-		type test struct {
-			Date *TimeFormat `json:"date"`
-		}
-
-		tests := []struct {
-			structure    *test
-			layout       string
-			expectedJSON string
-			diff         time.Duration
-		}{
-			{
-				structure:    &test{Date: NewTimeFormat(time.Date(2024, 4, 30, 5, 4, 7, 20, time.FixedZone("Test Zone", 0)), ShortDateLayout)},
-				layout:       ShortDateLayout,
-				expectedJSON: `{"date":"2024-04-30"}`,
-				diff:         time.Hour * 24,
-			},
-			{
-				structure:    &test{Date: nil},
-				layout:       ShortDateLayout,
-				expectedJSON: `{"date":null}`,
-				diff:         time.Hour * 24,
-			},
-		}
-
-		for _, tc := range tests {
-			marshaled, err := json.Marshal(tc.structure)
-			assert.Equal(t, nil, err)
-			assert.Equal(t, tc.expectedJSON, string(marshaled))
-
-			unmarshaled := &test{Date: newTimeLayout(tc.layout)}
-			err = json.Unmarshal(marshaled, unmarshaled)
-			assert.Equal(t, nil, err)
-
-			if tc.structure != nil && tc.structure.Date != nil {
-				diffedTime := tc.structure.Date.Add(-tc.diff)
-				assert.Equal(t, true, diffedTime.Before(unmarshaled.Date.Time) || diffedTime.Equal(unmarshaled.Date.Time))
-				assert.Equal(t, true, tc.structure.Date.After(unmarshaled.Date.Time) || tc.structure.Date.Equal(unmarshaled.Date.Time))
-			}
-		}
-	})
 }

go.mod

@@ -1,11 +1,3 @@
-module git.denco.store/fakz9/ozon-api-client
+module github.com/diphantxm/ozon-api-client
 
-go 1.20
+go 1.18
-
-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

@@ -1,17 +0,0 @@
-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

@@ -3,8 +3,9 @@ package ozon
 import (
 	"context"
 	"net/http"
+	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Analytics struct {
@@ -13,10 +14,10 @@ type Analytics struct {
 
 type GetAnalyticsDataParams struct {
 	// Date from which the data will be in the report
-	DateFrom *core.TimeFormat `json:"date_from"`
+	DateFrom time.Time `json:"date_from"`
 
 	// Date up to which the data will be in the report
-	DateTo *core.TimeFormat `json:"date_to"`
+	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:
@@ -125,7 +126,7 @@ type GetAnalyticsDataResultData struct {
 }
 
 type GetAnalyticsDataResultDimension struct {
-	// Product SKU
+	// Identifier
 	Id string `json:"id"`
 
 	// Name
@@ -163,8 +164,8 @@ type GetStocksOnWarehousesParams 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"`
 
-	// Warehouse type filter
+	// Warehouse type filter:
-	WarehouseType WarehouseType `json:"warehouse_type" default:"ALL"`
+	WarehouseType WarehouseType `json:"warehouse_type"`
 }
 
 type GetStocksOnWarehousesResponse struct {
@@ -202,7 +203,7 @@ type GetStocksOnWarehousesResultRow struct {
 	WarehouseName string `json:"warehouse_name"`
 }
 
-// Method for getting a report on leftover stocks and products movement at Ozon warehouses
+// Report on stocks and products movement at Ozon warehouses
 func (c Analytics) GetStocksOnWarehouses(ctx context.Context, params *GetStocksOnWarehousesParams) (*GetStocksOnWarehousesResponse, error) {
 	url := "/v2/analytics/stock_on_warehouses"
 
@@ -216,235 +217,3 @@ func (c Analytics) GetStocksOnWarehouses(ctx context.Context, params *GetStocksO
 
 	return resp, nil
 }
-
-type GetProductTurnoverParams struct {
-	// Number of values in the response
-	Limit int64 `json:"limit"`
-
-	// Number of elements to skip in the response.
-	//
-	// For example, if offset = 10, the response starts with the 11th element found
-	Offset int32 `json:"offset"`
-
-	// Product identifiers in the Ozon system, SKU
-	SKU []string `json:"sku"`
-}
-
-type GetProductTurnoverResponse struct {
-	core.CommonResponse
-
-	// Products
-	Items []ProductTurnoverItem `json:"items"`
-}
-
-type ProductTurnoverItem struct {
-	// Average daily number of product items sold over the last 60 days
-	Ads float64 `json:"ads"`
-
-	// Product stock, pcs
-	CurrentStock int64 `json:"current_stock"`
-
-	// Number of days the stock will last based on your average daily sales
-	IDC float64 `json:"idc"`
-
-	// Product stock level
-	IDCGrade string `json:"idc_grade"`
-}
-
-// Use the method to get the product turnover rate and the number of days the current stock will last.
-//
-// If you request a list of products by sku, the limit and offset parameters are optional.
-func (c Analytics) GetProductTurnover(ctx context.Context, params *GetProductTurnoverParams) (*GetProductTurnoverResponse, error) {
-	url := "/v1/analytics/turnover/stocks"
-
-	resp := &GetProductTurnoverResponse{}
-
-	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 GetStockManagementParams struct {
-	// GetStockManagementFilter
-	Filter GetStockManagementFilter `json:"filter"`
-
-	// Number of values in the response
-	Limit int32 `json:"limit,omitempty"`
-
-	// Number of elements to skip in the response
-	Offset int32 `json:"offset,omitempty"`
-}
-
-type GetStockManagementFilter struct {
-	// Product identifiers in the Ozon system, SKU
-	SKUs []string `json:"skus"`
-
-	// The type of item in stock
-	StockTypes string `json:"stock_types"`
-
-	// Warehouse identifiers
-	WarehouseIds []string `json:"warehouse_ids"`
-}
-
-type GetStockManagementResponse struct {
-	core.CommonResponse
-
-	// Products
-	Items []StockItem `json:"items"`
-}
-
-type StockItem struct {
-	// Stock of defective products, pcs
-	DefectCount int64 `json:"defect_stock_count"`
-
-	// Stock of near-expired products, pcs
-	ExpiringCount int64 `json:"expiring_stock_count"`
-
-	// Product name
-	ProductName string `json:"name"`
-
-	// Product identifier in the seller's system
-	OfferId string `json:"offer_id"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Stock of valid products
-	ValidCount int64 `json:"valid_stock_count"`
-
-	// Stock of products that waiting for documents
-	WaitingDocsCount int64 `json:"waitingdocs_stock_count"`
-
-	// Warehouse name
-	WarehouseName string `json:"warehouse_name"`
-}
-
-// Use the method to find out how many product items are left in stock
-func (c Analytics) Stock(ctx context.Context, params *GetStockManagementParams) (*GetStockManagementResponse, error) {
-	url := "/v1/analytics/manage/stocks"
-
-	resp := &GetStockManagementResponse{}
-
-	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 GetProductQueriesParams struct {
-	// Date when analytics generation starts
-	DateFrom string `json:"date_from"`
-
-	//Date when analytics generation ends
-	DateTo string `json:"date_to"`
-
-	// Number of page returned in the request
-	Page int32 `json:"page"`
-
-	// Number of items on the pag
-	PageSize int32 `json:"page_size"`
-
-	// List of SKUs—product identifiers in the Ozon system.
-	// Analytics on requests is returned for them.
-	// Maximum value is 1,000 SKUs
-	SKUs []string `json:"skus"`
-
-	// Parameter by which products are sorted
-	SortBy string `json:"sort_by"`
-
-	// Sorting direction
-	SortDir string `json:"sort_dir"`
-}
-
-type GetProductQueriesResponse struct {
-	core.CommonResponse
-
-	// Period for which the analytics is generated
-	AnalyticsPeriod AnalyticsPeriod `json:"analytics_period"`
-
-	// Product list
-	Items []GetProductQueriesItem `json:"items"`
-
-	// Number of pages
-	PageCount int64 `json:"page_count"`
-
-	// Total number of queries
-	Total int64 `json:"total"`
-}
-
-type AnalyticsPeriod struct {
-	// Date when analytics generation starts
-	DateFrom string `json:"date_from"`
-
-	// Date when analytics generation ends
-	DateTo string `json:"date_to"`
-}
-
-type GetProductQueriesItem struct {
-	// Category name
-	Category string `json:"category"`
-
-	// Currency
-	Currency string `json:"currency"`
-
-	// Sales by queries
-	GMV float64 `json:"gmv"`
-
-	// Product name
-	Name string `json:"name"`
-
-	// Product identifier in the seller's system
-	OfferId string `json:"offer_id"`
-
-	// Average product position. Available only with the Premium or Premium Plus subscription, otherwise the field returns empty
-	Position float64 `json:"position"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Number of customers who searched for your product on Ozon
-	UniqueSearchUsers int64 `json:"unique_search_users"`
-
-	// Number of customers who have seen your product on Ozon.
-	// Available only with the Premium or Premium Plus subscription,
-	// otherwise the field returns empty
-	UniqueViewUsers int64 `json:"unique_view_users"`
-
-	// Conversion from product views.
-	// Available only with the Premium or Premium Plus subscription,
-	// otherwise the field returns empty
-	ViewConversion float64 `json:"view_conversion"`
-}
-
-// Use the method to get data about your product queries.
-// Full analytics is available with the Premium and Premium Plus subscription.
-// Without subscription, you can see a part of the metrics.
-// The method is similar to the Products in Search → Queries for my product tab in your personal account.
-//
-// You can view analytics by queries for certain dates.
-// To do this, specify the interval in the date_from and date_to fields.
-// Data for the last month are available in any interval except for
-// three days from the current date because these days the calculation is performed.
-// Analytics for dates later than a month ago is available only with
-// the Premium and Premium Plus subscription, and only by weeks.
-// Specify the date_from parameter in the request
-func (c Analytics) GetProductQueries(ctx context.Context, params *GetProductQueriesParams) (*GetProductQueriesResponse, error) {
-	url := "/v1/analytics/product-queries"
-
-	resp := &GetProductQueriesResponse{}
-
-	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/analytics_test.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"net/http"
 	"testing"
-	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetAnalyticsData(t *testing.T) {
@@ -23,8 +22,8 @@ func TestGetAnalyticsData(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetAnalyticsDataParams{
-				DateFrom:  core.NewTimeFormat(time.Now().Add(time.Duration(30)*24*time.Hour), core.ShortDateLayout),
+				DateFrom:  core.TimeFromString(t, "2006-01-02", "2020-09-01"),
-				DateTo:    core.NewTimeFormat(time.Now(), core.ShortDateLayout),
+				DateTo:    core.TimeFromString(t, "2006-01-02", "2021-10-15"),
 				Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
 				Metrics:   []GetAnalyticsDataFilterMetric{HistViewPDP},
 				Sort: []GetAnalyticsDataSort{
@@ -65,11 +64,8 @@ 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)
 		}
@@ -129,11 +125,8 @@ 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)
 		}
@@ -145,206 +138,3 @@ func TestGetStocksOnWarehouses(t *testing.T) {
 		}
 	}
 }
-
-func TestGetProductTurnover(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetProductTurnoverParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetProductTurnoverParams{
-				Limit: 1,
-				SKU:   []string{"string"},
-			},
-			`{
-				"items": [
-				  {
-					"ads": 0,
-					"current_stock": 0,
-					"idc": 0,
-					"idc_grade": "GRADES_NONE"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetProductTurnoverParams{},
-			`{
-				"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.Analytics().GetProductTurnover(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetProductTurnoverResponse{})
-
-		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.Items) > int(test.params.Limit) {
-				t.Errorf("Length of items is bigger than limit")
-			}
-		}
-	}
-}
-
-func TestGetStock(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetStockManagementParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetStockManagementParams{
-				Limit:  1,
-				Offset: 0,
-				Filter: GetStockManagementFilter{
-					StockTypes: "STOCK_TYPE_VALID",
-					SKUs: []string{
-						"string",
-					},
-				},
-			},
-			`{
-				"items": [
-				  {
-					"defect_stock_count": 0,
-					"expiring_stock_count": 0,
-					"name": "string",
-					"offer_id": "string",
-					"sku": 0,
-					"valid_stock_count": 0,
-					"waitingdocs_stock_count": 0,
-					"warehouse_name": "string"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetStockManagementParams{},
-			`{
-				"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.Analytics().Stock(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetStockManagementResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestGetProductQueries(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetProductQueriesParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetProductQueriesParams{
-				Page:     1,
-				PageSize: 10,
-				SKUs:     []string{"string"},
-			},
-			`{
-				"analytics_period": {
-				  "date_from": "string",
-				  "date_to": "string"
-				},
-				"items": [
-				  {
-					"category": "string",
-					"currency": "string",
-					"gmv": 0,
-					"name": "string",
-					"offer_id": "string",
-					"position": 0,
-					"sku": 0,
-					"unique_search_users": 0,
-					"unique_view_users": 0,
-					"view_conversion": 0
-				  }
-				],
-				"page_count": 0,
-				"total": 0
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetProductQueriesParams{},
-			`{
-				"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.Analytics().GetProductQueries(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetProductQueriesResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}

ozon/barcodes.go

@@ -1,111 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-
-	core "git.denco.store/fakz9/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

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

ozon/brands.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Brands struct {

ozon/brands_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestListCertifiedBrands(t *testing.T) {
@@ -29,6 +29,7 @@ func TestListCertifiedBrands(t *testing.T) {
 				"result": {
 				  "brand_certification": [
 					{
+					  "brand_id": 135476863,
 					  "brand_name": "Sea of Spa",
 					  "has_certificate": false
 					}
@@ -56,11 +57,8 @@ 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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Cancellations struct {
@@ -41,7 +41,7 @@ type CancellationInfo struct {
 	CancellationReasonMessage string `json:"cancellation_reason_message"`
 
 	// Delivery service integration type
-	TPLIntegrationType TPLIntegrationType `json:"tpl_integration_type"`
+	TPLIntegrationType string `json:"tpl_integration_type"`
 
 	// Cancellation request status
 	State CancellationInfoState `json:"state"`
@@ -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/conditional-cancellation/get"
+	url := "/v1/delivery-method/list"
 
 	resp := &GetCancellationInfoResponse{}
 
@@ -98,30 +98,30 @@ func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoP
 
 type ListCancellationsParams struct {
 	// Filters
-	Filter *ListCancellationsFilter `json:"filter,omitempty"`
+	Filter ListCancellationsFilter `json:"filter"`
 
 	// Number of cancellation requests in the response
-	Limit int32 `json:"limit,omitempty"`
+	Limit int32 `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 int32 `json:"offset,omitempty"`
+	Offset int32 `json:"offset"`
 
 	// Additional information
-	With *ListCancellationWith `json:"with,omitempty"`
+	With ListCancellationWith `json:"with"`
 }
 
 type ListCancellationsFilter struct {
 	// Filter by cancellation initiator
-	CancellationInitiator []string `json:"cancellation_initiator,omitempty"`
+	CancellationInitiator []string `json:"cancellation_initiator"`
 
 	// Filter by shipment number.
 	//
 	// Optional parameter. You can pass several values here
-	PostingNumber string `json:"posting_number,omitempty"`
+	PostingNumber string `json:"posting_number"`
 
 	// Filter by cancellation request status
-	State string `json:"state,omitempty"`
+	State string `json:"state"`
 }
 
 type ListCancellationWith struct {
@@ -173,7 +173,7 @@ type ApproveRejectCancellationsParams struct {
 	CancellationId int64 `json:"cancellation_id"`
 
 	// Comment
-	Comment string `json:"comment,omitempty"`
+	Comment string `json:"comment"`
 }
 
 type ApproveRejectCancellationsResponse struct {

ozon/cancellations_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetCancellationInfo(t *testing.T) {
@@ -67,11 +67,8 @@ 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)
 		}
@@ -98,13 +95,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,
 				},
 			},
@@ -126,9 +123,9 @@ func TestListCancellations(t *testing.T) {
 					  "state": "APPROVED"
 					},
 					"cancellation_initiator": "CLIENT",
-					"order_date": "2021-09-03T07:04:53.22Z",
+					"order_date": "2021-09-03T07:04:53.220Z",
 					"approve_comment": "",
-					"approve_date": "2021-09-03T09:13:12.6142Z",
+					"approve_date": "2021-09-03T09:13:12.614200Z",
 					"auto_approve_date": "2021-09-06T07:17:12.116114Z"
 				  },
 				  {
@@ -180,11 +177,8 @@ 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)
 		}
@@ -228,11 +222,8 @@ 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)
 		}
@@ -276,11 +267,8 @@ 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

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Categories struct {
@@ -12,44 +12,37 @@ type Categories struct {
 }
 
 type GetProductTreeParams struct {
+	// Category identifier
+	CategoryId int64 `json:"category_id"`
+
 	// Response language
-	Language Language `json:"language,omitempty"`
+	Language Language `json:"language" default:"DEFAULT"`
 }
 
 type GetProductTreeResponse struct {
 	core.CommonResponse
 
-	// Categories list
+	// Category list
 	Result []GetProductTreeResult `json:"result"`
 }
 
 type GetProductTreeResult struct {
 	// Category identifier
-	DescriptionCategoryId int64 `json:"description_category_id"`
+	CategoryId int64 `json:"category_id"`
-
-	// Category name
-	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"`
+	Children []GetProductTreeResponse `json:"children"`
+
+	// Category name
+	Title string `json:"title"`
 }
 
 // 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.
-// We don't create new categories by user request.
+// It is not possible to create categories by user request
-func (c *Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*GetProductTreeResponse, error) {
+func (c Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*GetProductTreeResponse, error) {
-	url := "/v1/description-category/tree"
+	url := "/v2/category/tree"
 
 	resp := &GetProductTreeResponse{}
 
@@ -63,14 +56,14 @@ func (c *Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*G
 }
 
 type GetCategoryAttributesParams struct {
+	// Filter by characteristics
+	AttributeType AttributeType `json:"attribute_type" default:"ALL"`
+
 	// Category identifier
-	DescriptionCategoryId int64 `json:"description_category_id"`
+	CategoryId []int64 `json:"category_id"`
 
 	// Response language
-	Language Language `json:"language,omitempty"`
+	Language Language `json:"language" default:"DEFAULT"`
-
-	// Product type identifier
-	TypeId int64 `json:"type_id"`
 }
 
 type GetCategoryAttributesResponse struct {
@@ -81,10 +74,17 @@ 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.
-	// 	true — the attribute has its own set of values for each category.
+	//   - false — the attribute has the same set of values for all categories
-	// 	false — the attribute has the same set of values for all categories
 	CategoryDependent bool `json:"category_dependent"`
 
 	// Characteristic description
@@ -99,29 +99,26 @@ type GetCategoryAttributesResult struct {
 	// Characteristics group name
 	GroupName string `json:"group_name"`
 
-	// Number of document generation task
+	// Document generation task number
 	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 or shoes of the same model may have different colors and sizes. That is, color and size are aspect attributes.
+	// For example, clothes and 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.
-	// 	- `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
-	// 	- `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,
-	// 	- `true`—the characteristic is a set of values,
+	//   - false — the characteristic consists of a single value
-	// 	- `false`—the characteristic consists of a single value
 	IsCollection bool `json:"is_collection"`
 
 	// Indicates that the characteristic is mandatory:
-	//
+	//   - true — a mandatory characteristic,
-	// 	- `true`—a mandatory characteristic,
+	//   - false — you can leave the characteristic out
-	// 	- `false`—an optional characteristic
 	IsRequired bool `json:"is_required"`
 
 	// Name
@@ -129,21 +126,17 @@ type GetCategoryAttributesResult 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 and type.
+// Getting characteristics for specified product category.
 //
-// If the dictionary_id value is 0, there is no directory.
+// Pass up to 20 category identifiers in the `category_id` list.
-// If the value is different, there are directories.
+//
-// Get them using the `/v1/description-category/attribute/values` method.
+// You can check whether the attribute has a nested directory by the `dictionary_id` parameter.
-func (c *Categories) Attributes(ctx context.Context, params *GetCategoryAttributesParams) (*GetCategoryAttributesResponse, error) {
+// The 0 value means there is no directory. If the value is different, then there are directories.
-	url := "/v1/description-category/attribute"
+// 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"
 
 	resp := &GetCategoryAttributesResponse{}
 
@@ -161,58 +154,42 @@ type GetAttributeDictionaryParams struct {
 	AttributeId int64 `json:"attribute_id"`
 
 	// Category identifier
-	DescriptionCategoryId int64 `json:"description_category_id"`
+	CategoryId int64 `json:"category_id"`
 
 	// Response language
-	Language Language `json:"language,omitempty"`
+	// The default language is Russian
+	Language Language `json:"language" default:"DEFAULT"`
 
-	// Identifier of the directory to start the response with.
-	// If `last_value_id` is 10, the response will contain directories starting from the 11th
 	LastValueId int64 `json:"last_value_id"`
 
 	// Number of values in the response:
-	//
+	//   - maximum — 5000
-	// 	- maximum—5000,
+	//   - minimum — 1
-	// 	- minimum—1.
+	Limit int64 `json:"limit"`
-	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"`
 
-	// Characteristic values
+	// Method result
 	Result []GetAttributeDictionaryResult `json:"result"`
 }
 
 type GetAttributeDictionaryResult struct {
-	// Characteristic value identifier
+	Id      int64  `json:"id"`
-	Id int64 `json:"id"`
+	Info    string `json:"info"`
-
-	// Additional description
-	Info string `json:"info"`
-
-	// Image link
 	Picture string `json:"picture"`
 
 	// Product characteristic value
 	Value string `json:"value"`
 }
 
-// Returns characteristics value directory.
+// 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
-// To check if an attribute has a nested directory,
+func (c Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
-// use the `/v1/description-category/attribute` method.
+	url := "/v2/category/attribute/values"
-func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
-	url := "/v1/description-category/attribute/values"
 
 	resp := &GetAttributeDictionaryResponse{}
 
@@ -224,63 +201,3 @@ func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttrib
 
 	return resp, nil
 }
-
-type SearchAttributeDictionaryParams struct {
-	// Characteristics identifier
-	AttributeId int64 `json:"attribute_id"`
-
-	// Category identifier
-	DescriptionCategoryId int64 `json:"description_category_id"`
-
-	// The value to be searched for
-	//  - minimum—2 characters
-	Value string `json:"value"`
-
-	// Number of values in the response:
-	//
-	// 	- maximum—100,
-	// 	- minimum—1.
-	Limit int64 `json:"limit,omitempty"`
-
-	// Product type identifier
-	TypeId int64 `json:"type_id"`
-}
-
-type SearchAttributeDictionaryResponse struct {
-	core.CommonResponse
-
-	// Characteristic values
-	Result []SearchAttributeDictionaryResult `json:"result"`
-}
-
-type SearchAttributeDictionaryResult struct {
-	// 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"`
-}
-
-// Returns found characteristics value directory.
-//
-// To check if an attribute has a nested directory,
-// use the `/v1/description-category/attribute` method.
-func (c *Categories) SearchAttributesDictionary(ctx context.Context, params *SearchAttributeDictionaryParams) (*SearchAttributeDictionaryResponse, error) {
-	url := "/v1/description-category/attribute/values/search"
-
-	resp := &SearchAttributeDictionaryResponse{}
-
-	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/categories_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetProductTree(t *testing.T) {
@@ -22,17 +22,14 @@ func TestGetProductTree(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetProductTreeParams{
-				Language: English,
+				CategoryId: 17034410,
 			},
 			`{
 				"result": [
 				  {
-					"description_category_id": 0,
+					"category_id": 17034410,
-					"category_name": "string",
+					"title": "Развивающие игрушки",
-					"children": [],
+					"children": []
-					"disabled": true,
-					"type_id": 0,
-					"type_name": "string"
 				  }
 				]
 			}`,
@@ -56,14 +53,19 @@ 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")
+				}
+			}
+		}
 	}
 }
 
@@ -81,26 +83,25 @@ func TestGetCategoryAttributes(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetCategoryAttributesParams{
-				DescriptionCategoryId: 12345,
+				CategoryId: []int64{17034410},
-				Language:              English,
-				TypeId:                2,
 			},
 			`{
 				"result": [
 				  {
-					"category_dependent": true,
+					"category_id": 17034410,
-					"description": "string",
+					"attributes": [
-					"dictionary_id": 0,
+					  {
-					"group_id": 0,
+						"id": 85,
-					"group_name": "string",
+						"name": "Бренд",
-					"id": 0,
+						"description": "Укажите наименование бренда, под которым произведен товар. Если товар не имеет бренда, используйте значение \"Нет бренда\"",
-					"is_aspect": true,
+						"type": "String",
-					"is_collection": true,
+						"is_collection": false,
-					"is_required": true,
+						"is_required": true,
-					"name": "string",
+						"group_id": 0,
-					"type": "string",
+						"group_name": "",
-					"attribute_complex_id": 0,
+						"dictionary_id": 28732849
-					"max_value_count": 0
+					  }
+					]
 				  }
 				]
 			}`,
@@ -124,14 +125,22 @@ 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")
+				}
+			}
+		}
 	}
 }
 
@@ -149,23 +158,33 @@ func TestGetAttributeDictionary(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetAttributeDictionaryParams{
-				AttributeId:           123456,
+				AttributeId: 10096,
-				DescriptionCategoryId: 12,
+				CategoryId:  17028968,
-				Language:              English,
+				LastValueId: 0,
-				LastValueId:           1,
+				Limit:       3,
-				Limit:                 5,
-				TypeId:                6,
 			},
 			`{
-				"has_next": true,
 				"result": [
 				  {
-					"id": 0,
+					"id": 61571,
-					"info": "string",
+					"value": "белый",
-					"picture": "string",
+					"info": "",
-					"value": "string"
+					"picture": ""
+				  },
+				  {
+					"id": 61572,
+					"value": "прозрачный",
+					"info": "",
+					"picture": ""
+				  },
+				  {
+					"id": 61573,
+					"value": "бежевый",
+					"info": "",
+					"picture": ""
 				  }
-				]
+				],
+				"has_next": true
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -187,79 +206,8 @@ 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)
-		}
-
-		if resp.StatusCode == http.StatusOK {
-			if len(resp.Result) > int(test.params.Limit) {
-				t.Errorf("Length of response result is bigger than limit")
-			}
-		}
-	}
-}
-
-func TestSearchAttributeDictionary(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *SearchAttributeDictionaryParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&SearchAttributeDictionaryParams{
-				AttributeId:           123456,
-				DescriptionCategoryId: 12,
-				Value:                 "34",
-				Limit:                 5,
-				TypeId:                6,
-			},
-			`{
-				"has_next": true,
-				"result": [
-				  {
-					"id": 0,
-					"info": "string",
-					"picture": "string",
-					"value": "string"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&SearchAttributeDictionaryParams{},
-			`{
-				"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.Categories().SearchAttributesDictionary(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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Certificates struct {
@@ -99,6 +99,11 @@ type ListOfCertifiedCategoriesParams struct {
 type ListOfCertifiedCategoriesResponse struct {
 	core.CommonResponse
 
+	// Method result
+	Result ListOfCertifiedCategoriesResult `json:"reult"`
+}
+
+type ListOfCertifiedCategoriesResult struct {
 	// Certified categories details
 	Certification []ListOfCertifiedCategoriesResultCert `json:"certification"`
 
@@ -107,25 +112,16 @@ type ListOfCertifiedCategoriesResponse struct {
 }
 
 type ListOfCertifiedCategoriesResultCert struct {
-	// Identifier of the certified category
-	CategoryId int64 `json:"category_id"`
-
 	// Category name
 	CategoryName string `json:"category_name"`
 
 	// Indication of a mandatory category
 	IsRequired bool `json:"is_required"`
-
-	// Type identifier of the certified category
-	TypeId int64 `json:"type_id"`
-
-	// Name of the type of certified category
-	TypeName string `json:"type_name"`
 }
 
 // List of certified categories
 func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
-	url := "/v2/product/certification/list"
+	url := "/v1/product/certificate/types"
 
 	resp := &ListOfCertifiedCategoriesResponse{}
 
@@ -237,7 +233,7 @@ type GetCertificateInfoResult struct {
 	AccordanceTypeCode string `json:"accordance_type_code"`
 
 	// Certificate rejection reason
-	RejectionReasonCode string `json:"rejection_reason_code"`
+	RejectionReasonCode string `json:"rejectio_reason_code"`
 
 	// Moderator's comment
 	VerificationComment string `json:"verification_comment"`
@@ -311,7 +307,7 @@ type ListCertificatesResultCert struct {
 	CertificateName string `json:"certificate_name"`
 
 	// Type
-	TypeCode string `json:"type_code"`
+	TypeCode string `json:"type"`
 
 	// Status
 	StatusCode string `json:"status_code"`
@@ -320,13 +316,13 @@ type ListCertificatesResultCert struct {
 	AccordanceTypecode string `json:"accordance_type_code"`
 
 	// Certificate rejection reason
-	RejectionReasonCode string `json:"rejection_reason_code"`
+	RejectionReasonCode string `json:"rejectio_reason_code"`
 
 	// Moderator's comment
 	VerificationComment string `json:"verification_comment"`
 
 	// Issue date
-	IssueDate time.Time `json:"issue_date"`
+	IssueDate time.Time `json:"issue_data"`
 
 	// Expire date
 	ExpireDate time.Time `json:"expire_date"`

ozon/certificates_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestListOfAccordanceTypes(t *testing.T) {
@@ -56,11 +56,8 @@ 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)
 		}
@@ -122,11 +119,8 @@ 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)
 		}
@@ -151,16 +145,15 @@ func TestListOfCertifiedCategories(t *testing.T) {
 				PageSize: 100,
 			},
 			`{
-				"certification": [
+				"result": {
-				  {
+				  "certification": [
-					"category_id": 0,
+					{
-					"category_name": "string",
+					  "is_required": true,
-					"is_required": true,
+					  "category_name": "Витаминно-минеральные комплексы для взрослых"
-					"type_id": 0,
+					}
-					"type_name": "string"
+				  ],
-				  }
+				  "total": 1
-				],
+				}
-				"total": 1
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -182,11 +175,8 @@ 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)
 		}
@@ -233,11 +223,8 @@ 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)
 		}
@@ -286,11 +273,8 @@ 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)
 		}
@@ -348,11 +332,8 @@ 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)
 		}
@@ -425,11 +406,8 @@ 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)
 		}
@@ -475,11 +453,8 @@ 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)
 		}
@@ -536,11 +511,8 @@ 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)
 		}
@@ -593,11 +565,8 @@ 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)
 		}
@@ -643,11 +612,8 @@ 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)
 		}
@@ -693,11 +659,8 @@ 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)
 		}
@@ -749,11 +712,8 @@ 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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Chats struct {
@@ -14,14 +14,14 @@ type Chats struct {
 
 type ListChatsParams struct {
 	// Chats filter
-	Filter *ListChatsFilter `json:"filter,omitempty"`
+	Filter ListChatsFilter `json:"filter"`
 
-	// Number of values in the response. The default value is 30. The maximum value is 1000
+	// Number of values in the response. Default value is 1
-	Limit int64 `json:"limit" default:"30"`
+	Limit int64 `json:"limit" default:"1"`
 
 	// 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,omitempty"`
+	Offset int64 `json:"offset"`
 }
 
 type ListChatsFilter struct {
@@ -39,7 +39,7 @@ type ListChatsResponse struct {
 	core.CommonResponse
 
 	// Chats data
-	Chats []ListChatsChatData `json:"chats"`
+	Chats []ListChatsChat `json:"chats"`
 
 	// Total number of chats
 	TotalChatsCount int64 `json:"total_chats_count"`
@@ -48,6 +48,20 @@ type ListChatsResponse struct {
 	TotalUnreadCount int64 `json:"total_unread_count"`
 }
 
+type ListChatsChat struct {
+	// Chat data
+	Chat ListChatsChatData `json:"chat"`
+
+	// Identifier of the first unread chat message
+	FirstUnreadMessageId string `json:"first_unread_message_id"`
+
+	// Identifier of the last message in the chat
+	LastMessageId string `json:"last_message_id"`
+
+	// Number of unread messages in the chat
+	UnreadCount int64 `json:"unread_count"`
+}
+
 type ListChatsChatData struct {
 	// Chat identifier
 	ChatId string `json:"chat_id"`
@@ -65,15 +79,6 @@ type ListChatsChatData struct {
 
 	// Chat creation date
 	CreatedAt time.Time `json:"created_at"`
-
-	// Identifier of the first unread chat message
-	FirstUnreadMessageId uint64 `json:"first_unread_message_id"`
-
-	// Identifier of the last message in the chat
-	LastMessageId uint64 `json:"last_message_id"`
-
-	// Number of unread messages in the chat
-	UnreadCount int64 `json:"unread_count"`
 }
 
 // Returns information about chats by specified filters
@@ -164,20 +169,14 @@ type ChatHistoryParams struct {
 	// The default value is `Backward`. You can set the number of messages in the limit parameter
 	Direction string `json:"direction" default:"Backward"`
 
-	Filter *ChatHistoryFilter `json:"filter,omitempty"`
-
 	// Identifier of the message from which the chat history will be displayed.
 	// Default value is the last visible message
 	FromMessageId string `json:"from_message_id"`
 
-	// Number of messages in the response. The default value is 50. The maximum value is 1000
+	// Number of messages in the response. The default value is 50
 	Limit int64 `json:"limit" default:"50"`
 }
 
-type ChatHistoryFilter struct {
-	MessageIds []string `json:"message_ids"`
-}
-
 type ChatHistoryResponse struct {
 	core.CommonResponse
 
@@ -189,33 +188,22 @@ type ChatHistoryResponse struct {
 }
 
 type ChatHistoryMessage struct {
-	Context *ChatHistoryContext `json:"context,omitempty"`
-
 	// Message creation date
 	CreatedAt time.Time `json:"created_at"`
 
 	// Array with message content in Markdown format
 	Data []string `json:"data"`
 
-	IsImage bool `json:"is_image"`
-
 	// Indication of the read message
 	IsRead bool `json:"is_read"`
 
 	// Message identifier
 	MessageId string `json:"message_id"`
 
-	ModarateImageStatus string `json:"moderate_image_status"`
-
 	// Chat participant identifier
 	User ChatHistoryMessageUser `json:"user"`
 }
 
-type ChatHistoryContext struct {
-	OrderNumber string `json:"order_number"`
-	SKU         string `json:"sku"`
-}
-
 type ChatHistoryMessageUser struct {
 	// Chat participant identifier
 	Id string `json:"id"`
@@ -229,9 +217,9 @@ type ChatHistoryMessageUser struct {
 	Type string `json:"type"`
 }
 
-// Returns the history of chat messages. By default messages are shown from newest to oldest.
+// Chat history
 func (c Chats) History(ctx context.Context, params *ChatHistoryParams) (*ChatHistoryResponse, error) {
-	url := "/v3/chat/history"
+	url := "/v2/chat/history"
 
 	resp := &ChatHistoryResponse{}
 
@@ -252,7 +240,7 @@ type UpdateChatParams struct {
 	FromMessageId uint64 `json:"from_message_id"`
 
 	// Number of messages in the response
-	Limit int64 `json:"limit,omitempty"`
+	Limit int64 `json:"limit"`
 }
 
 type UpdateChatResponse struct {
@@ -398,7 +386,7 @@ func (c Chats) Create(ctx context.Context, params *CreateNewChatParams) (*Create
 
 type MarkAsReadParams struct {
 	// Chat identifier
-	ChatId string `json:"chat_id"`
+	Chatid string `json:"chat_id"`
 
 	// Message identifier
 	FromMessageId uint64 `json:"from_message_id"`

ozon/chats_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestListChats(t *testing.T) {
@@ -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,
 				},
@@ -32,13 +32,15 @@ func TestListChats(t *testing.T) {
 			`{
 				"chats": [
 				  {
-            "chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
+					"chat": {
-            "chat_status": "Opened",
+					  "created_at": "2022-07-22T08:07:19.581Z",
-            "chat_type": "Seller_Support",
+					  "chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
-            "created_at": "2022-07-22T08:07:19.581Z",
+					  "chat_status": "Opened",
-            "unread_count": 1,
+					  "chat_type": "Seller_Support"
-            "last_message_id": 3000000000128004274,
+					},
-            "first_unread_message_id": 3000000000118021931
+					"first_unread_message_id": "3000000000118021931",
+					"last_message_id": "30000000001280042740",
+					"unread_count": 1
 				  }
 				],
 				"total_chats_count": 25,
@@ -64,21 +66,18 @@ 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)
 		}
 
 		if resp.StatusCode == http.StatusOK {
 			if len(resp.Chats) > 0 {
-				if resp.Chats[0].ChatStatus == "" {
+				if resp.Chats[0].Chat.ChatStatus == "" {
 					t.Errorf("Chat status cannot be empty")
 				}
-				if resp.Chats[0].ChatType == "" {
+				if resp.Chats[0].Chat.ChatType == "" {
 					t.Errorf("Chat type cannot be empty")
 				}
 			}
@@ -126,11 +125,8 @@ 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)
 		}
@@ -178,11 +174,8 @@ 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)
 		}
@@ -212,22 +205,16 @@ func TestChatHistory(t *testing.T) {
 				"has_next": true,
 				"messages": [
 				  {
-					"context": {
-					  "order_number": "123456789",
-					  "sku": "987654321"
-					},
-					"created_at": "2019-08-24T14:15:22Z",
-					"data": [
-					  "Здравствуйте, у меня вопрос по вашему товару \"Стекло защитное для смартфонов\", артикул 11223. Подойдет ли он на данную [ модель ](https://www.ozon.ru/product/smartfon-samsung-galaxy-a03s-4-64-gb-chernyy) телефона?"
-					],
-					"is_image": true,
-					"is_read": true,
 					"message_id": "3000000000817031942",
-					"moderate_image_status": "SUCCESS",
 					"user": {
 					  "id": "115568",
 					  "type": "Сustomer"
-					}
+					},
+					"created_at": "2022-07-18T20:58:04.528Z",
+					"is_read": true,
+					"data": [
+					  "Здравствуйте, у меня вопрос по вашему товару \"Стекло защитное для смартфонов\", артикул 11223. Подойдет ли он на данную [ модель ](https://www.ozon.ru/product/smartfon-samsung-galaxy-a03s-4-64-gb-chernyy) телефона?"
+					]
 				  }
 				]
 			}`,
@@ -251,11 +238,8 @@ 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)
 		}
@@ -321,11 +305,8 @@ 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)
 		}
@@ -373,11 +354,8 @@ 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)
 		}
@@ -404,7 +382,7 @@ func TestMarkAsRead(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&MarkAsReadParams{
-				ChatId:        "99feb3fc-a474-469f-95d5-268b470cc607",
+				Chatid:        "99feb3fc-a474-469f-95d5-268b470cc607",
 				FromMessageId: 3000000000118032000,
 			},
 			`{
@@ -430,11 +408,8 @@ 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/clusters.go

@@ -1,74 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-type Clusters struct {
-	client *core.Client
-}
-
-type ListClustersParams struct {
-	// Clusters identifiers
-	ClusterIds []string `json:"cluster_ids"`
-
-	// Cluster type
-	ClusterType string `json:"cluster_type"`
-}
-
-type ListClustersResponse struct {
-	core.CommonResponse
-
-	// Cluster details
-	Clusters []Cluster `json:"clusters"`
-}
-
-type Cluster struct {
-	// Cluster identifier
-	Id int64 `json:"id"`
-
-	// Cluster warehouse details
-	LogisticClusters []LogisticCluster `json:"logistic_clusters"`
-
-	// Cluster name
-	Name string `json:"name"`
-
-	// Cluster type
-	Type string `json:"type"`
-}
-
-type LogisticCluster struct {
-	// Warehouse status
-	IsArchived bool `json:"is_archived"`
-
-	// Warehouses
-	Warehouses []LogisticClusterWarehouse `json:"warehouses"`
-}
-
-type LogisticClusterWarehouse struct {
-	// Warehouse name
-	Name string `json:"name"`
-
-	// Warehouse type
-	Type string `json:"type"`
-
-	// Warehouse identifier
-	Id int64 `json:"warehouse_id"`
-}
-
-func (c Clusters) List(ctx context.Context, params *ListClustersParams) (*ListClustersResponse, error) {
-	url := "/v1/cluster/list"
-
-	resp := &ListClustersResponse{}
-
-	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/clusters_test.go

@@ -1,78 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-func TestListClusters(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListClustersParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListClustersParams{
-				ClusterIds:  []string{"string"},
-				ClusterType: "CLUSTER_TYPE_UNKNOWN",
-			},
-			`{
-				"clusters": [
-				  {
-					"id": 0,
-					"logistic_clusters": [
-					  {
-						"is_archived": true,
-						"warehouses": [
-						  {
-							"name": "string",
-							"type": "FULL_FILLMENT",
-							"warehouse_id": 0
-						  }
-						]
-					  }
-					],
-					"name": "string",
-					"type": "CLUSTER_TYPE_UNKNOWN"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListClustersParams{},
-			`{
-				"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.Clusters().List(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListClustersResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}

ozon/common.go

@@ -1,8 +1,6 @@
 package ozon
 
-import (
+import "time"
-	"time"
-)
 
 const (
 	testTimeout = 5 * time.Second
@@ -93,16 +91,16 @@ const (
 	Purchased      ListDiscountRequestsStatus = "PURCHASED"
 )
 
-type WorkingDay int
+type WorkingDay string
 
 const (
-	Mon WorkingDay = 1
+	Mon WorkingDay = "1"
-	Tue WorkingDay = 2
+	Tue WorkingDay = "2"
-	Wed WorkingDay = 3
+	Wed WorkingDay = "3"
-	Thu WorkingDay = 4
+	Thu WorkingDay = "4"
-	Fri WorkingDay = 5
+	Fri WorkingDay = "5"
-	Sat WorkingDay = 6
+	Sat WorkingDay = "6"
-	Sun WorkingDay = 7
+	Sun WorkingDay = "7"
 )
 
 type GetAnalyticsDataDimension string
@@ -126,6 +124,24 @@ const (
 type SupplyRequestState string
 
 const (
+	// request draft. Only for supplies via vDC
+	Draft SupplyRequestState = "DRAFT"
+
+	// selecting supply options. Only for supplies via vDC
+	SupplyVariantsArranging SupplyRequestState = "SUPPLY_VARIANTS_ARRANGING"
+
+	// no supply options, the request is archived. Only for supplies via vDC
+	HasNoSupplyVariantsArchive SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_ARCHIVE"
+
+	// no supply options. Only for supplies via vDC
+	HasNoSupplyVariantsNew SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_NEW"
+
+	// supply being approved. Only for supplies via vDC
+	SupplyVariantsConfirmation SupplyRequestState = "SUPPLY_VARIANTS_CONFIRMATION"
+
+	// time reservation
+	TimeslotBooking SupplyRequestState = "TIMESLOT_BOOKING"
+
 	// filling in the data
 	DATA_FILLING SupplyRequestState = "DATA_FILLING"
 
@@ -296,9 +312,6 @@ const (
 
 	// delivery by the seller
 	NonIntegratedTPLType TPLIntegrationType = "non_integrated"
-
-	// Russian Post delivery scheme
-	HybrydTPLType TPLIntegrationType = "hybryd"
 )
 
 type DetailsDeliveryItemName string
@@ -333,7 +346,7 @@ const (
 	ServiceProcessingIdentifiedSurplus          DetailsServiceItemName = "MarketplaceServiceProcessingIdentifiedSurplus"
 	ServiceProcessingIdentifiedDiscrepancies    DetailsServiceItemName = "MarketplaceServiceProcessingIdentifiedDiscrepancies"
 	ServiceItemInternetSiteAdvertising          DetailsServiceItemName = "MarketplaceServiceItemInternetSiteAdvertising"
-	ServiceItemPremiumSubscribtion              DetailsServiceItemName = "MarketplaceServiceItemSubscribtionPremium"
+	ServiceItemPremiumSubscribtion              DetailsServiceItemName = "MarketplaceServiceItemPremiumSubscribtion"
 	AgencyFeeAggregator3PLGlobalItem            DetailsServiceItemName = "MarketplaceAgencyFeeAggregator3PLGlobalItem"
 )
 
@@ -445,25 +458,18 @@ const (
 type GetFBSReturnsFilterStatus string
 
 const (
-	Moving                    GetFBSReturnsFilterStatus = "moving"
 	ReturnedToSeller          GetFBSReturnsFilterStatus = "returned_to_seller"
 	WaitingForSeller          GetFBSReturnsFilterStatus = "waiting_for_seller"
 	AcceptedFromCustomer      GetFBSReturnsFilterStatus = "accepted_from_customer"
 	CancelledWithCompensation GetFBSReturnsFilterStatus = "cancelled_with_compensation"
 	ReadyForShipment          GetFBSReturnsFilterStatus = "ready_for_shipment"
-	Disposing                 GetFBSReturnsFilterStatus = "disposing"
-	Disposed                  GetFBSReturnsFilterStatus = "disposed"
-	ArrivedForResale          GetFBSReturnsFilterStatus = "arrived_for_resale"
-	MovingToResale            GetFBSReturnsFilterStatus = "moving_to_resale"
 )
 
 type GetFBOReturnsFilterStatus string
 
 const (
-	GetFBOReturnsFilterStatusCreated                   GetFBOReturnsFilterStatus = "Created"
+	GetFBOReturnsFilterStatusReturnedToOzon GetFBOReturnsFilterStatus = "ReturnedToOzon"
-	GetFBOReturnsFilterStatusReturnedToOzon            GetFBOReturnsFilterStatus = "ReturnedToOzon"
+	GetFBOReturnsFilterStatusCancelled      GetFBOReturnsFilterStatus = "Cancelled"
-	GetFBOReturnsFilterStatusCancelled                 GetFBOReturnsFilterStatus = "Cancelled"
-	GetFBOReturnsFilterStatusCancelledWithCompensation GetFBOReturnsFilterStatus = "CancelledWithCompensation"
 )
 
 type GetFBOReturnsReturnStatus string
@@ -534,402 +540,3 @@ 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"
-
-	// report on sales to legal entities
-	ReportTypeDocB2BSales ReportType = "DOCUMENT_B2B_SALES"
-
-	// settlement report
-	ReportTypeMutualSettlement ReportType = "MUTUAL_SETTLEMENT"
-)
-
-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"
-)
-
-type GetCarriageStatus string
-
-const (
-	// acceptance in progress
-	GetCarriageStatusReceived GetCarriageStatus = "received"
-
-	// closed after acceptance
-	GetCarriageStatusClosed GetCarriageStatus = "closed"
-
-	GetCarriageStatusSended GetCarriageStatus = "sended"
-
-	GetCarriageStatusCancelled GetCarriageStatus = "cancelled"
-)
-
-type TransactionOperationService string
-
-const (
-	// return of unclaimed products from the customer to the warehouse
-	TransactionNotDelivered TransactionOperationService = "MarketplaceNotDeliveredCostItem"
-
-	// return from the customer to the warehouse after delivery
-	TransactionReturnAfterDelivery TransactionOperationService = "TransactionOperationServiceNotDelivered"
-
-	// product delivery to the customer
-	TransactionDelivery TransactionOperationService = "MarketplaceDeliveryCostItem"
-
-	// purchasing reviews on the platform
-	TransactionSaleReviews TransactionOperationService = "MarketplaceSaleReviewsItem"
-
-	// products delivery to the Ozon warehouse (cross docking)
-	TransactionItemAdForSupplierLogistic TransactionOperationService = "ItemAdvertisementForSupplierLogistic"
-
-	// product placement service
-	TransactionServiceStorageItem TransactionOperationService = "OperationMarketplaceServiceStorage"
-
-	// products promotion
-	TransactionMarketingActionCost TransactionOperationService = "MarketplaceMarketingActionCostItem"
-
-	// promotion and selling on an instalment plan
-	TransactionServiceItemInstallment TransactionOperationService = "MarketplaceServiceItemInstallment"
-
-	// mandatory products labeling
-	TransactionServiceMarkingItems TransactionOperationService = "MarketplaceServiceItemMarkingItems"
-
-	// flexible payment schedule
-	TransactionServiceFlexiblePaymentSchedule TransactionOperationService = "MarketplaceServiceItemFlexiblePaymentSchedule"
-
-	// picking up products for removal by the seller
-	TransactionServiceReturnFromStock TransactionOperationService = "MarketplaceServiceItemReturnFromStock"
-
-	TransactionServiceStarsMembership TransactionOperationService = "ItemAgentServiceStarsMembership"
-
-	// forwarding trade
-	TransactionItemAdForSupplierLogisticSeller TransactionOperationService = "ItemAdvertisementForSupplierLogisticSeller"
-
-	// last mile
-	TransactionServiceDeliveryToCustomer TransactionOperationService = "MarketplaceServiceItemDelivToCustomer"
-
-	// pipeline
-	TransactionServiceDirectFlowTrans TransactionOperationService = "MarketplaceServiceItemDirectFlowTrans"
-
-	// shipment processing
-	TransactionServiceDropoffFF TransactionOperationService = "MarketplaceServiceItemDropoffFF"
-
-	// shipment processing
-	TransactionServiceDropoffPVZ TransactionOperationService = "MarketplaceServiceItemDropoffPVZ"
-
-	// shipment processing
-	TransactionServiceDropoffSC TransactionOperationService = "MarketplaceServiceItemDropoffSC"
-
-	// order packaging
-	TransactionServiceFulfillment TransactionOperationService = "MarketplaceServiceItemFulfillment"
-
-	// picking products up by car from the seller's address (Pick-up)
-	TransactionServicePickup TransactionOperationService = "MarketplaceServiceItemPickup"
-
-	// return processing
-	TransactionServiceReturnAfterDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnAfterDelivToCustomer"
-
-	// reverse pipeline
-	TransactionServiceReturnFlowTrans TransactionOperationService = "MarketplaceServiceItemReturnFlowTrans"
-
-	// cancellation processing
-	TransactionServiceReturnNotDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnNotDelivToCustomer"
-
-	// unredeemed order processing
-	TransactionServiceReturnPartGoodsCustomer TransactionOperationService = "MarketplaceServiceItemReturnPartGoodsCustomer"
-
-	// acquiring payment
-	TransactionRedistributionOfAcquiringOperation TransactionOperationService = "MarketplaceRedistributionOfAcquiringOperation"
-
-	// FBS return short-term placement
-	TransactionServiceAtPickupPointFBS TransactionOperationService = "MarketplaceReturnStorageServiceAtThePickupPointFbsItem"
-
-	// FBS return long-term placement
-	TransactionServiceInWarehouseFBS TransactionOperationService = "MarketplaceReturnStorageServiceInTheWarehouseFbsItem"
-
-	// bulky products delivery
-	TransactionServiceDeliveryKGT TransactionOperationService = "MarketplaceServiceItemDeliveryKGT"
-
-	// logistics
-	TransactionServiceDirectFlowLogistic TransactionOperationService = "MarketplaceServiceItemDirectFlowLogistic"
-
-	// reverse logistics
-	TransactionServiceReturnFlowLogistic TransactionOperationService = "MarketplaceServiceItemReturnFlowLogistic"
-
-	// "Seller's Bonus" promotion service
-	TransactionServicePremiumCashbackIndPoints TransactionOperationService = "MarketplaceServicePremiumCashbackIndividualPoints"
-
-	// Premium promotion service, fixed commission
-	TransactionServicePremiumPromotion TransactionOperationService = "MarketplaceServicePremiumPromotion"
-
-	// withholding for product shortage
-	TransactionServiceWithHoldingForUndeliverableGoods TransactionOperationService = "OperationMarketplaceWithHoldingForUndeliverableGoods"
-
-	// drop-off service at the pick-up point
-	TransactionServiceDropoffPPZ TransactionOperationService = "MarketplaceServiceItemDropoffPPZ"
-
-	// reissue of returns at the pick-up point
-	TransactionServiceRedistributionReturnsPVZ TransactionOperationService = "MarketplaceServiceItemRedistributionReturnsPVZ"
-
-	// Agregator 3PL Globalagency service tariffication
-	TransactionServiceAgencyFeeAggregator3PLGlobal TransactionOperationService = "OperationMarketplaceAgencyFeeAggregator3PLGlobal"
-)
-
-type PaymentTypeGroupName string
-
-const (
-	PaymentTypeGroupByCardOnline              PaymentTypeGroupName = "by card online"
-	PaymentTypeGroupOzonCard                  PaymentTypeGroupName = "Ozon Card"
-	PaymentTypeGroupOzonCardAtCheckout        PaymentTypeGroupName = "Ozon Card at checkout"
-	PaymentTypeGroupBySavedBankCardUponPickup PaymentTypeGroupName = "by saved bank card upon pick-up"
-	PaymentTypeGroupFasterPaymentSystem       PaymentTypeGroupName = "Faster payment system"
-	PaymentTypeGroupOzonInstallment           PaymentTypeGroupName = "Ozon Installment"
-	PaymentTypeGroupPaymentToCurrentAccount   PaymentTypeGroupName = "payment to current account"
-	PaymentTypeGroupSberpay                   PaymentTypeGroupName = "Sberpay"
-)
-
-type VisualStatus string
-
-const (
-	// dispute with the customer has been opened
-	VisualStatusDisputeOpened VisualStatus = "DisputeOpened"
-
-	// pending with the seller
-	VisualStatusOnSellerApproval VisualStatus = "OnSellerApproval"
-
-	// at the pick-up point
-	VisualStatusArrivedAtReturnPlace VisualStatus = "ArrivedAtReturnPlace"
-
-	// pending clarification by the seller
-	VisualStatusOnSellerClarification VisualStatus = "OnSellerClarification"
-
-	// pending clarification by the seller after partial compensation
-	VisualStatusOnSellerClarificationPartial VisualStatus = "OnSellerClarificationAfterPartialCompensation"
-
-	// partial compensation offered
-	VisualStatusOfferedPartial VisualStatus = "OfferedPartialCompensation"
-
-	// refund approved
-	VisualStatusReturnMoneyApproved VisualStatus = "ReturnMoneyApproved"
-
-	// partial compensation provided
-	VisualStatusPartialReturned VisualStatus = "PartialCompensationReturned"
-
-	// refund rejected, dispute isn't opened
-	VisualStatusCancelledDisputeNotOpen VisualStatus = "CancelledDisputeNotOpen"
-
-	// request rejected
-	VisualStatusRejected VisualStatus = "Rejected"
-
-	// request rejected by Ozon
-	VisualStatusCrmRejected VisualStatus = "CrmRejected"
-
-	// request canceled
-	VisualStatusCancelled VisualStatus = "Cancelled"
-
-	// request approved by the seller
-	VisualStatusApproved VisualStatus = "Approved"
-
-	// request approved by Ozon
-	VisualStatusApprovedByOzon VisualStatus = "ApprovedByOzon"
-
-	// seller received the return
-	VisualStatusReceivedBySeller VisualStatus = "ReceivedBySeller"
-
-	// return is on its way to the seller
-	VisualStatusMovingToSeller VisualStatus = "MovingToSeller"
-
-	// seller received the refund
-	VisualStatusReturnCompensated VisualStatus = "ReturnCompensated"
-
-	// courier is taking the return to the seller
-	VisualStatusReturningByCourier VisualStatus = "ReturningByCourier"
-
-	// on disposal
-	VisualStatusUtilizing VisualStatus = "Utilizing"
-
-	// disposed of
-	VisualStatusUtilized VisualStatus = "Utilized"
-
-	// customer received full refund
-	VisualStatusMoneyReturned VisualStatus = "MoneyReturned"
-
-	// partial refund has been approved
-	VisualStatusPartialInProcess VisualStatus = "PartialCompensationInProcess"
-
-	// seller opened a dispute
-	VisualStatusDisputeYouOpened VisualStatus = "DisputeYouOpened"
-
-	// compensation rejected
-	VisualStatusCompensationRejected VisualStatus = "CompensationRejected"
-
-	// support request sent
-	VisualStatusDisputeOpening VisualStatus = "DisputeOpening"
-
-	// awaiting your decision on compensation
-	VisualStatusCompensationOffered VisualStatus = "CompensationOffered"
-
-	// awaiting compensation
-	VisualStatusWaitingCompensation VisualStatus = "WaitingCompensation"
-
-	// an error occurred when sending the support request
-	VisualStatusSendingError VisualStatus = "SendingError"
-
-	// decision period has expired
-	VisualStatusCompensationRejectedBySla VisualStatus = "CompensationRejectedBySla"
-
-	// seller has refused compensation
-	VisualStatusCompensationRejectedBySeller VisualStatus = "CompensationRejectedBySeller"
-
-	// on the way to the Ozon warehouse
-	VisualStatusMovingToOzon VisualStatus = "MovingToOzon"
-
-	// arrived at the Ozon warehouse
-	VisualStatusReturnedToOzon VisualStatus = "ReturnedToOzon"
-
-	// quick refund
-	VisualStatusMoneyReturnedBySystem VisualStatus = "MoneyReturnedBySystem"
-
-	// awaiting shipping
-	VisualStatusWaitingShipment VisualStatus = "WaitingShipment"
-)
-
-type VAT string
-
-const (
-	VAT0   VAT = "0"
-	VAT005 VAT = "0.05"
-	VAT007 VAT = "0.07"
-	VAT01  VAT = "0.1"
-	VAT02  VAT = "0.2"
-)

ozon/finance.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Finance struct {
@@ -13,23 +13,20 @@ type Finance struct {
 }
 
 type ReportOnSoldProductsParams struct {
-	// Month
+	// Time period in the `YYYY-MM` format
-	Month int32 `json:"month"`
+	Date string `json:"date"`
-
-	// Year
-	Year int32 `json:"year"`
 }
 
 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"`
@@ -37,7 +34,7 @@ type ReportonSoldProductsResult struct {
 
 type ReportOnSoldProductsResultHeader struct {
 	// Report ID
-	Id string `json:"number"`
+	Id string `json:"num"`
 
 	// Report generation date
 	DocDate string `json:"doc_date"`
@@ -46,10 +43,10 @@ type ReportOnSoldProductsResultHeader struct {
 	ContractDate string `json:"contract_date"`
 
 	// Offer agreement number
-	ContractNum string `json:"contract_number"`
+	ContractNum string `json:"contract_num"`
 
 	// Currency of your prices
-	CurrencySysName string `json:"currency_sys_name"`
+	CurrencyCode string `json:"currency_code"`
 
 	// Amount to accrue
 	DocAmount float64 `json:"doc_amount"`
@@ -67,13 +64,13 @@ type ReportOnSoldProductsResultHeader struct {
 	PayerName string `json:"payer_name"`
 
 	// Recipient's TIN
-	RecipientINN string `json:"receiver_inn"`
+	RecipientINN string `json:"rcv_inn"`
 
 	// Recipient's Tax Registration Reason Code (KPP)
-	RecipientKPP string `json:"receiver_kpp"`
+	RecipientKPP string `json:"rcv_kpp"`
 
 	// Recipient's name
-	RecipientName string `json:"receiver_name"`
+	RecipientName string `json:"rcv_name"`
 
 	// Period start in the report
 	StartDate string `json:"start_date"`
@@ -84,28 +81,13 @@ type ReportOnSoldProductsResultHeader struct {
 
 type ReportOnSoldProductsResultRow struct {
 	// Row number
-	RowNumber int32 `json:"rowNumber"`
+	RowNumber int32 `json:"row_number"`
 
-	// Product Information
+	// Product ID
-	Item ReturnOnSoldProduct `json:"item"`
+	ProductId int64 `json:"product_id"`
 
-	// Commission including the quantity of products, discounts and extra charges.
-	// Ozon compensates it for the returned products
-	ReturnCommission ReturnCommission `json:"return_commission"`
-
-	// Percentage of sales commission by category
-	CommissionRatio float64 `json:"commission_ratio"`
-
-	// Delivery fee
-	DeliveryCommission ReturnCommission `json:"delivery_commission"`
-
-	// Seller's discounted price
-	SellerPricePerInstance float64 `json:"seller_price_per_instance"`
-}
-
-type ReturnOnSoldProduct struct {
 	// Product name
-	ProductName string `json:"name"`
+	ProductName string `json:"product_name"`
 
 	// Product barcode
 	Barcode string `json:"barcode"`
@@ -113,46 +95,65 @@ type ReturnOnSoldProduct struct {
 	// Product identifier in the seller's system
 	OfferId string `json:"offer_id"`
 
-	SKU int64 `json:"sku"`
+	// Sales commission by category
-}
+	CommissionPercent float64 `json:"commission_percent"`
 
-type ReturnCommission struct {
+	// Seller's price with their discount
-	// Amount
+	Price float64 `json:"price"`
-	Amount float64 `json:"amount"`
 
-	// Points for discounts
+	// Selling price: the price at which the customer purchased the product. For sold products
-	Bonus float64 `json:"bonus"`
+	PriceSale float64 `json:"price_sale"`
+
+	// Sold for amount.
+	//
+	// Sold products cost considering the quantity and regional coefficients. Calculation is made by the sale_amount price
+	SaleAmount float64 `json:"sale_amount"`
 
 	// Commission for sold products, including discounts and extra charges
-	Commission float64 `json:"commission"`
+	SaleCommission float64 `json:"sale_commission"`
 
-	// Additional payment at the expense of Ozon
+	// Extra charge at the expense of Ozon.
-	Compensation float64 `json:"compensation"`
+	//
+	// Amount that Ozon will compensate the seller if the Ozon discount is greater than or equal to the sales commission
+	SaleDiscount float64 `json:"sale_discount"`
 
-	// Price per item
+	// Total accrual for the products sold.
-	PricePerInstance float64 `json:"price_per_instance"`
+	//
+	// Amount after deduction of sales commission, application of discounts and extra charges
+	SalePriceSeller float64 `json:"sale_price_seller"`
 
-	// Product quantity
+	// Quantity of products sold at the price_sale price
-	Quantity int32 `json:"quantity"`
+	SaleQuantity int32 `json:"sale_qty"`
 
-	// Ozon referral fee
+	// Price at which the customer purchased the product. For returned products
-	StandardFee float64 `json:"standard_fee"`
+	ReturnSale float64 `json:"return_sale"`
 
-	// Payouts on partner loyalty mechanics: green prices
+	// Cost of returned products, taking into account the quantity and regional coefficients.
-	BankCoinvestment float64 `json:"bank_coinvestment"`
+	// Calculation is carried out at the return_sale price
+	ReturnAmount float64 `json:"return_amount"`
 
-	// Payouts on partner loyalty mechanics: stars
+	// Commission including the quantity of products, discounts and extra charges.
-	Stars float64 `json:"stars"`
+	// Ozon compensates it for the returned products
+	ReturnCommission float64 `json:"return_commission"`
 
-	// Total accrual
+	// Extra charge at the expense of Ozon.
-	Total float64 `json:"total"`
+	//
+	// Amount of the discount at the expense of Ozon on returned products.
+	// Ozon will compensate it to the seller if the Ozon discount is greater than or equal to the sales commission
+	ReturnDiscount float64 `json:"return_discount"`
+
+	// Amount charged to the seller for returned products after deducing sales commissions, applying discounts and extra charges
+	ReturnPriceSeller float64 `json:"return_price_seller"`
+
+	// Quantity of returned products
+	ReturnQuantity int32 `json:"return_qty"`
 }
 
 // Returns information on products sold and returned within a month. Canceled or non-purchased products are not included.
 //
 // Report is returned no later than the 5th day of the next month
 func (c Finance) ReportOnSoldProducts(ctx context.Context, params *ReportOnSoldProductsParams) (*ReportOnSoldProductsResponse, error) {
-	url := "/v2/finance/realization"
+	url := "/v1/finance/realization"
 
 	resp := &ReportOnSoldProductsResponse{}
 
@@ -210,7 +211,7 @@ type GetTotalTransactionsSumResult struct {
 	AccrualsForSale float64 `json:"accruals_for_sale"`
 
 	// Compensations
-	CompensationAmount float64 `json:"compensation_amount"`
+	CompensationAmount float64 `json:"compensatino_amount"`
 
 	// Charges for delivery and returns when working under rFBS scheme
 	MoneyTransfer float64 `json:"money_transfer"`
@@ -271,7 +272,7 @@ type ListTransactionsFilter struct {
 	Date ListTransactionsFilterDate `json:"date"`
 
 	// Operation type
-	OperationType []string `json:"operation_type"`
+	OperationType string `json:"operation_type"`
 
 	// Shipment number
 	PostingNumber string `json:"posting_number"`
@@ -305,10 +306,10 @@ type ListTransactionsResult struct {
 	// Transactions infromation
 	Operations []ListTransactionsResultOperation `json:"operations"`
 
-	// Number of pages. If 0, there are no more pages
+	// Number of pages
 	PageCount int64 `json:"page_count"`
 
-	// Number of transactions on all pages. If 0, there are no more transactions
+	// Number of products
 	RowCount int64 `json:"row_count"`
 }
 
@@ -362,7 +363,11 @@ type ListTransactionsResultOperationItem struct {
 }
 
 type ListTransactionsResultOperationPosting struct {
-	// Delivery scheme
+	// Delivery scheme:
+	//   - FBO — delivery to Ozon warehouse
+	//   - FBS — delivery from seller's warehouse
+	//   - RFBS — delivery service of seller's choice
+	//   - Crossborder — delivery from abroad
 	DeliverySchema string `json:"delivery_schema"`
 
 	// Date the product was accepted for processing
@@ -377,7 +382,7 @@ type ListTransactionsResultOperationPosting struct {
 
 type ListTransactionsResultOperationService struct {
 	// Service name
-	Name TransactionOperationService `json:"name"`
+	Name string `json:"name"`
 
 	// Price
 	Price float64 `json:"price"`
@@ -399,57 +404,3 @@ func (c Finance) ListTransactions(ctx context.Context, params *ListTransactionsP
 
 	return resp, nil
 }
-
-type GetReportParams struct {
-	// Time period in the YYYY-MM format
-	Date string `json:"date"`
-
-	// Response language
-	Language string `json:"language"`
-}
-
-type ReportResponse struct {
-	core.CommonResponse
-
-	// Method result
-	Result ReportResult `json:"result"`
-}
-
-type ReportResult struct {
-	// Unique report identifier
-	Code string `json:"code"`
-}
-
-// Use the method to get mutual settlements report.
-// Matches the Finance → Documents → Analytical reports → Mutual
-// settlements report section in your personal account.
-func (c Finance) MutualSettlements(ctx context.Context, params *GetReportParams) (*ReportResponse, error) {
-	url := "/v1/finance/mutual-settlement"
-
-	resp := &ReportResponse{}
-
-	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
-}
-
-// Use the method to get sales to legal entities report.
-// Matches the Finance → Documents → Legal
-// entities sales register section in your personal account.
-func (c Finance) SalesToLegalEntities(ctx context.Context, params *GetReportParams) (*ReportResponse, error) {
-	url := "/v1/finance/mutual-settlement"
-
-	resp := &ReportResponse{}
-
-	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/finance_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestReportOnSoldProducts(t *testing.T) {
@@ -23,66 +23,55 @@ func TestReportOnSoldProducts(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ReportOnSoldProductsParams{
-				Month: 9,
+				Date: "2022-09",
-				Year:  2022,
 			},
 			`{
-				"result": {
+				"result": [
-				  "header": {
-					"contract_date": "string",
-					"contract_number": "string",
-					"currency_sys_name": "string",
-					"doc_amount": 0,
-					"doc_date": "string",
-					"number": "string",
-					"payer_inn": "string",
-					"payer_kpp": "string",
-					"payer_name": "string",
-					"receiver_inn": "string",
-					"receiver_kpp": "string",
-					"receiver_name": "string",
-					"start_date": "string",
-					"stop_date": "string",
-					"vat_amount": 0
-				  },
-				  "rows": [
 					{
-					  "commission_ratio": 0,
+						"header": [
-					  "delivery_commission": {
+							{
-						"amount": 0,
+								"doc_date": "2022-09-22",
-						"bonus": 0,
+								"num": "string",
-						"commission": 0,
+								"start_date": "2022-09-02",
-						"compensation": 0,
+								"stop_date": "2022-09-22",
-						"price_per_instance": 0,
+								"contract_date": "2022-09-02",
-						"quantity": 0,
+								"contract_num": "string",
-						"standard_fee": 0,
+								"payer_name": "string",
-						"bank_coinvestment": 0,
+								"payer_inn": "string",
-						"stars": 0,
+								"payer_kpp": "string",
-						"total": 0
+								"rcv_name": "string",
-					  },
+								"rcv_inn": "string",
-					  "item": {
+								"rcv_kpp": "string",
-						"barcode": "string",
+								"doc_amount": 1,
-						"name": "string",
+								"vat_amount": 1,
-						"offer_id": "string",
+								"currency_code": "string"
-						"sku": 0
+							}
-					  },
+						],
-					  "return_commission": {
+						"rows": [
-						"amount": 0,
+							{
-						"bonus": 0,
+								"row_number": 0,
-						"commission": 0,
+								"product_id": 0,
-						"compensation": 0,
+								"product_name": "string",
-						"price_per_instance": 0,
+								"offer_id": "string",
-						"quantity": 0,
+								"barcode": "string",
-						"standard_fee": 0,
+								"price": 0,
-						"bank_coinvestment": 0,
+								"commission_percent": 0,
-						"stars": 0,
+								"price_sale": 0,
-						"total": 0
+								"sale_qty": 0,
-					  },
+								"sale_amount": 0,
-					  "rowNumber": 0,
+								"sale_discount": 0,
-					  "seller_price_per_instance": 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
+							}
+						]
 					}
-				  ]
+				]
-				}
 			}`,
 			"",
 		},
@@ -106,11 +95,8 @@ 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)
 		}
@@ -178,11 +164,8 @@ 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)
 		}
@@ -270,135 +253,8 @@ 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)
-		}
-
-		if resp.StatusCode != http.StatusOK {
-			if resp.Message != test.errorMessage {
-				t.Errorf("got wrong error message: got: %s, expected: %s", resp.Message, test.errorMessage)
-			}
-		}
-	}
-}
-
-func TestMutualSettlements(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode   int
-		headers      map[string]string
-		params       *GetReportParams
-		response     string
-		errorMessage string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetReportParams{
-				Date:     "2024-08",
-				Language: "DEFAULT",
-			},
-			`{
-				"result": {
-				  "code": "string"
-				}
-			}`,
-			"",
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetReportParams{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-			"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.Finance().MutualSettlements(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ReportResponse{})
-
-		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.Message != test.errorMessage {
-				t.Errorf("got wrong error message: got: %s, expected: %s", resp.Message, test.errorMessage)
-			}
-		}
-	}
-}
-
-func TestSalesToLegalEntities(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode   int
-		headers      map[string]string
-		params       *GetReportParams
-		response     string
-		errorMessage string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetReportParams{
-				Date:     "2024-08",
-				Language: "DEFAULT",
-			},
-			`{
-				"result": {
-				  "code": "string"
-				}
-			}`,
-			"",
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetReportParams{},
-			`{
-				"code": 16,
-				"message": "Client-Id and Api-Key headers are required"
-			}`,
-			"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.Finance().SalesToLegalEntities(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ReportResponse{})
-
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/invoices.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Invoices struct {
@@ -16,11 +16,11 @@ type CreateUpdateProformaLinkParams struct {
 	// Shipment number
 	PostingNumber string `json:"posting_number"`
 
-	// Invoice link. Use the `v1/invoice/file/upload` method to create a link
+	// Proforma invoice link
 	URL string `json:"url"`
 
-	// Product HS-codes
+	// Invoice HS-code. Pass a number up to 12 characters long
-	HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
+	HSCode string `json:"hs_code"`
 
 	// Invoice date
 	Date time.Time `json:"date"`
@@ -28,21 +28,13 @@ type CreateUpdateProformaLinkParams struct {
 	// Invoice number. The number can contain letters and digits, maximum length is 50 characters
 	Number string `json:"number"`
 
-	// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal point
+	// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal poin
 	Price float64 `json:"price"`
 
 	// Invoice currency
 	PriceCurrency InvoiceCurrency `json:"price_currency" default:"USD"`
 }
 
-type CreateUpdateProformaLinkHSCode struct {
-	// Product HS code
-	Code string `json:"code"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU string `json:"sku"`
-}
-
 type CreateUpdateProformaLinkResponse struct {
 	core.CommonResponse
 
@@ -50,9 +42,9 @@ type CreateUpdateProformaLinkResponse struct {
 	Result bool `json:"result"`
 }
 
-// Create or edit an invoice for VAT refund to Turkey sellers
+// Create or edit proforma invoice link for VAT refund to Turkey sellers
 func (c Invoices) CreateUpdate(ctx context.Context, params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
-	url := "/v2/invoice/create-or-update"
+	url := "/v1/invoice/create-or-update"
 
 	resp := &CreateUpdateProformaLinkResponse{}
 
@@ -78,32 +70,13 @@ type GetProformaLinkResponse struct {
 }
 
 type GetProformaLinkResult struct {
-	// Invoice uploading date
+	// Proforma invoice link
-	Date time.Time `json:"date"`
-
-	// Invoice link
 	FileURL string `json:"file_url"`
-
-	// Product HS-codes
-	HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
-
-	// Invoice number
-	Number string `json:"number"`
-
-	// Cost stated in the invoice.
-	// The fractional part is separated by decimal point,
-	// up to two digits after the decimal point.
-	//
-	// Example: 199.99
-	Price float64 `json:"price"`
-
-	// Invoice currency
-	PriceCurrency InvoiceCurrency `json:"price_currency"`
 }
 
 // Get a proforma invoice link
 func (c Invoices) Get(ctx context.Context, params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
-	url := "/v2/invoice/get"
+	url := "/v1/invoice/get"
 
 	resp := &GetProformaLinkResponse{}
 
@@ -141,33 +114,3 @@ func (c Invoices) Delete(ctx context.Context, params *DeleteProformaLinkParams)
 
 	return resp, nil
 }
-
-type UploadInvoiceParams struct {
-	// Base64 encoded invoice
-	Content string `json:"base64_content"`
-
-	// Shipment number
-	PostingNumber string `json:"posting_number"`
-}
-
-type UploadInvoiceResponse struct {
-	core.CommonResponse
-
-	// Link to invoice
-	URL string `json:"url"`
-}
-
-// Available file types: JPEG and PDF. Maximum file size: 10 MB
-func (c Invoices) Upload(ctx context.Context, params *UploadInvoiceParams) (*UploadInvoiceResponse, error) {
-	url := "/v1/invoice/file/upload"
-
-	resp := &UploadInvoiceResponse{}
-
-	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/invoices_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestCreateUpdateProformaLink(t *testing.T) {
@@ -24,16 +24,7 @@ func TestCreateUpdateProformaLink(t *testing.T) {
 			&CreateUpdateProformaLinkParams{
 				PostingNumber: "33920146-0252-1",
 				URL:           "https://cdn.ozone.ru/s3/ozon-disk-api/techdoc/seller-api/earsivfatura_1690960445.pdf",
-				HSCodes: []CreateUpdateProformaLinkHSCode{
+				HSCode:        "2134322",
-					{
-						Code: "534758761999",
-						SKU:  "SKU123",
-					},
-					{
-						Code: "534758761000",
-						SKU:  "SKU456",
-					},
-				},
 				Date:          core.TimeFromString(t, "2006-01-02T15:04:05Z", "2023-08-01T12:08:44.342Z"),
 				Number:        "424fdsf234",
 				Price:         234.34,
@@ -62,11 +53,8 @@ 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)
 		}
@@ -91,17 +79,7 @@ func TestGetProformaLink(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "date": "2019-08-24T14:15:22Z",
+				  "file_url": "string"
-				  "file_url": "string",
-				  "hs_codes": [
-					{
-					  "code": "string",
-					  "sku": "string"
-					}
-				  ],
-				  "number": "string",
-				  "price": 0,
-				  "price_currency": "string"
 				}
 			}`,
 		},
@@ -124,11 +102,8 @@ 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)
 		}
@@ -174,62 +149,8 @@ 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)
-		}
-	}
-}
-
-func TestUploadInvoice(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *UploadInvoiceParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&UploadInvoiceParams{
-				PostingNumber: "posting number",
-				Content:       "content",
-			},
-			`{
-				"url": "string"
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&UploadInvoiceParams{},
-			`{
-				"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.Invoices().Upload(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &UploadInvoiceResponse{})
-
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/notifications/server_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type testData struct {
@@ -626,14 +626,12 @@ 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{}{}
@@ -642,19 +640,16 @@ 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

@@ -3,22 +3,13 @@ package ozon
 import (
 	"net/http"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 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
 
@@ -40,11 +31,6 @@ type Client struct {
 	chats         *Chats
 	certificates  *Certificates
 	strategies    *Strategies
-	barcodes      *Barcodes
-	passes        *Passes
-	clusters      *Clusters
-	quants        *Quants
-	reviews       *Reviews
 }
 
 func (c Client) Analytics() *Analytics {
@@ -119,66 +105,10 @@ func (c Client) Strategies() *Strategies {
 	return c.strategies
 }
 
-func (c Client) Barcodes() *Barcodes {
+func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
-	return c.barcodes
+	coreClient := core.NewClient(httpClient, DefaultAPIBaseUrl, map[string]string{
-}
+		"Client-Id": clientId,
-
+		"Api-Key":   apiKey,
-func (c Client) Passes() *Passes {
-	return c.passes
-}
-
-func (c Client) Clusters() *Clusters {
-	return c.clusters
-}
-
-func (c Client) Quants() *Quants {
-	return c.quants
-}
-
-func (c Client) Reviews() *Reviews {
-	return c.reviews
-}
-
-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{
@@ -201,11 +131,6 @@ func NewClient(opts ...ClientOption) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
-		barcodes:      &Barcodes{client: coreClient},
-		passes:        &Passes{client: coreClient},
-		clusters:      &Clusters{client: coreClient},
-		quants:        &Quants{client: coreClient},
-		reviews:       &Reviews{client: coreClient},
 	}
 }
 
@@ -232,10 +157,5 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 		chats:         &Chats{client: coreClient},
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
-		barcodes:      &Barcodes{client: coreClient},
-		passes:        &Passes{client: coreClient},
-		clusters:      &Clusters{client: coreClient},
-		quants:        &Quants{client: coreClient},
-		reviews:       &Reviews{client: coreClient},
 	}
 }

ozon/ozon_test.go

@@ -1,27 +0,0 @@
-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/pass.go

@@ -1,302 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-type Passes struct {
-	client *core.Client
-}
-
-type ListPassesParams struct {
-	// Cursor for the next data sample
-	Cursor string `json:"curson"`
-
-	// Filters
-	Filter ListPassesFilter `json:"filter"`
-
-	// Limit on number of entries in a reply. Default value is 1000. Maximum value is 1000
-	Limit int32 `json:"limit"`
-}
-
-type ListPassesFilter struct {
-	// Filter by pass identifier
-	ArrivalPassIds []string `json:"arrival_pass_ids"`
-
-	// Filter by purpose of arrival:
-	//
-	// FBS_DELIVERY—delivery.
-	// FBS_RETURN—take out returns.
-	// If the parameter isn't specified, both purposes are considered.
-	//
-	// The specified purpose must be in the list of reasons for passes
-	ArrivalReason string `json:"arrival_reason"`
-
-	// Filter by drop-off points identifier
-	DropoffPointIds []int64 `json:"dropoff_point_ids"`
-
-	// true to get only active pass requests
-	OnlyActivePasses bool `json:"only_active_passes"`
-
-	// Filter by seller's warehouses identifier
-	WarehouseIds []int64 `json:"warehouse_ids"`
-}
-
-type ListPassesResponse struct {
-	core.CommonResponse
-
-	// List of passes
-	ArrivalPasses []ListPassesArrivalPass `json:"arrival_passes"`
-
-	// Cursor for the next data sample. If the parameter is empty, there is no more data
-	Cursor string `json:"cursor"`
-}
-
-type ListPassesArrivalPass struct {
-	// Pass identifier
-	ArrivalPassId int64 `json:"arrival_pass_id"`
-
-	// Arrival purpose
-	ArrivalReasons []string `json:"arrival_reasons"`
-
-	// Date and time of arrival in UTC format
-	ArrivalTime time.Time `json:"arrival_time"`
-
-	// Driver full name
-	DriverName string `json:"driver_name"`
-
-	// Driver phone number
-	DriverPhone string `json:"driver_phone"`
-
-	// Drop-off point identifier
-	DropoffPointId int64 `json:"dropoff_point_id"`
-
-	// true if the request is active
-	IsActive bool `json:"is_active"`
-
-	// Car license plate
-	VehicleLicensePlate string `json:"vehicle_license_plate"`
-
-	// Car model
-	VehicleModel string `json:"vehicle_model"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-}
-
-func (c Passes) List(ctx context.Context, params *ListPassesParams) (*ListPassesResponse, error) {
-	url := "/v1/pass/list"
-
-	resp := &ListPassesResponse{}
-
-	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 CreateCarriageParams struct {
-	// List of passes
-	ArrivalPasses []CarriageArrivalPass `json:"arrival_passes"`
-
-	// Freight identifier
-	CarriageId int64 `json:"carriage_id"`
-}
-
-type CarriageArrivalPass struct {
-	// Driver full name
-	DriverName string `json:"driver_name"`
-
-	// Driver phone number
-	DriverPhone string `json:"driver_phone"`
-
-	// Car license plate
-	VehicleLicensePlate string `json:"vehicle_license_plate"`
-
-	// Car model
-	VehicleModel string `json:"vehicle_model"`
-
-	// true if you will export returns. Default is false
-	WithReturns bool `json:"with_returns"`
-}
-
-type CreateCarriageResponse struct {
-	core.CommonResponse
-
-	// Pass identifiers
-	ArrivalPassIds []string `json:"arrival_pass_ids"`
-}
-
-func (c Passes) CreateCarriage(ctx context.Context, params *CreateCarriageParams) (*CreateCarriageResponse, error) {
-	url := "/v1/carriage/pass/create"
-
-	resp := &CreateCarriageResponse{}
-
-	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 UpdateCarriageParams struct {
-	ArrivalPasses []UpdateCarriageArrivalPass `json:"arrival_passes"`
-
-	CarriageId int64 `json:"carriage_id"`
-}
-
-type UpdateCarriageArrivalPass struct {
-	CarriageArrivalPass
-
-	Id int64 `json:"id"`
-}
-
-type UpdateCarriageResponse struct {
-	core.CommonResponse
-}
-
-func (c Passes) UpdateCarriage(ctx context.Context, params *UpdateCarriageParams) (*UpdateCarriageResponse, error) {
-	url := "/v1/carriage/pass/update"
-
-	resp := &UpdateCarriageResponse{}
-
-	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 DeleteCarriageParams struct {
-	// Pass identifiers
-	ArrivalPassIds []int64 `json:"arrival_pass_ids"`
-
-	// Freight identifier
-	CarriageId int64 `json:"carriage_id"`
-}
-
-type DeleteCarriageResponse struct {
-	core.CommonResponse
-}
-
-func (c Passes) DeleteCarriage(ctx context.Context, params *DeleteCarriageParams) (*DeleteCarriageResponse, error) {
-	url := "/v1/carriage/pass/delete"
-
-	resp := &DeleteCarriageResponse{}
-
-	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 CreateReturnParams struct {
-	// Array of passes
-	ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
-}
-
-type ReturnArrivalPass struct {
-	// Date and time of arrival in UTC format. At that time, the pass will become valid
-	ArrivalTime time.Time `json:"arrival_time"`
-
-	// Driver full name
-	DriverName string `json:"driver_name"`
-
-	// Driver phone number
-	DriverPhone string `json:"driver_phone"`
-
-	// Car license plate
-	VehicleLicensePlate string `json:"vehicle_license_plate"`
-
-	// Car model
-	VehicleModel string `json:"vehicle_model"`
-
-	// Drop-off point identifier for which the pass is issued
-	DropoffPointId int64 `json:"dropoff_point_id"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-}
-
-type CreateReturnResponse struct {
-	core.CommonResponse
-
-	// Pass identifiers
-	ArrivalPassIds []string `json:"arrival_pass_ids"`
-}
-
-func (c Passes) CreateReturn(ctx context.Context, params *CreateReturnParams) (*CreateReturnResponse, error) {
-	url := "/v1/return/pass/create"
-
-	resp := &CreateReturnResponse{}
-
-	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 UpdateReturnParams struct {
-	ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
-}
-
-type UpdateReturnResponse struct {
-	core.CommonResponse
-
-	// Pass identifiers
-	ArrivalPassIds []string `json:"arrival_pass_ids"`
-}
-
-func (c Passes) UpdateReturn(ctx context.Context, params *UpdateReturnParams) (*UpdateReturnResponse, error) {
-	url := "/v1/return/pass/update"
-
-	resp := &UpdateReturnResponse{}
-
-	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 DeleteReturnParams struct {
-	// Pass identifiers
-	ArrivalPassIds []int64 `json:"arrival_pass_ids"`
-}
-
-type DeleteReturnResponse struct {
-	core.CommonResponse
-}
-
-func (c Passes) DeleteReturn(ctx context.Context, params *DeleteReturnParams) (*DeleteReturnResponse, error) {
-	url := "/v1/return/pass/delete"
-
-	resp := &DeleteReturnResponse{}
-
-	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/pass_test.go

@@ -1,431 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"testing"
-	"time"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-func TestListPasses(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListPassesParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListPassesParams{
-				Cursor: "",
-				Filter: ListPassesFilter{
-					ArrivalPassIds:   []string{"string"},
-					ArrivalReason:    "string",
-					DropoffPointIds:  []int64{123},
-					OnlyActivePasses: true,
-					WarehouseIds:     []int64{456},
-				},
-			},
-			`{
-				"arrival_passes": [
-				  {
-					"arrival_pass_id": 0,
-					"arrival_reasons": [
-					  "string"
-					],
-					"arrival_time": "2019-08-24T14:15:22Z",
-					"driver_name": "string",
-					"driver_phone": "string",
-					"dropoff_point_id": 123,
-					"is_active": true,
-					"vehicle_license_plate": "string",
-					"vehicle_model": "string",
-					"warehouse_id": 456
-				  }
-				],
-				"cursor": "string"
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListPassesParams{},
-			`{
-				"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.Passes().List(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListPassesResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-
-		if len(resp.ArrivalPasses) != 0 {
-			if resp.ArrivalPasses[0].WarehouseId != test.params.Filter.WarehouseIds[0] {
-				t.Errorf("warehouse id in request and response should be equal")
-			}
-
-			if resp.ArrivalPasses[0].DropoffPointId != test.params.Filter.DropoffPointIds[0] {
-				t.Errorf("dropoff point id in request and response should be equal")
-			}
-		}
-	}
-}
-
-func TestCreateArrivalPass(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *CreateCarriageParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&CreateCarriageParams{
-				ArrivalPasses: []CarriageArrivalPass{
-					{
-						DriverName:          "string",
-						DriverPhone:         "string",
-						VehicleLicensePlate: "string",
-						VehicleModel:        "string",
-						WithReturns:         true,
-					},
-				},
-				CarriageId: 14,
-			},
-			`{
-				"arrival_pass_ids": [
-				  "154"
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&CreateCarriageParams{},
-			`{
-				"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.Passes().CreateCarriage(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &CreateCarriageResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestUpdateArrivalPass(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *UpdateCarriageParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&UpdateCarriageParams{
-				ArrivalPasses: []UpdateCarriageArrivalPass{
-					{
-						Id: 11,
-						CarriageArrivalPass: CarriageArrivalPass{
-							DriverName:          "string",
-							DriverPhone:         "string",
-							VehicleLicensePlate: "string",
-							VehicleModel:        "string",
-							WithReturns:         true,
-						},
-					},
-				},
-				CarriageId: 14,
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&UpdateCarriageParams{},
-			`{
-				"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.Passes().UpdateCarriage(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &UpdateCarriageResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestDeleteArrivalPass(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *DeleteCarriageParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&DeleteCarriageParams{
-				ArrivalPassIds: []int64{123},
-				CarriageId:     14,
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&DeleteCarriageParams{},
-			`{
-				"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.Passes().DeleteCarriage(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &DeleteCarriageResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestCreateReturn(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *CreateReturnParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&CreateReturnParams{
-				ArrivalPasses: []ReturnArrivalPass{
-					{
-						ArrivalTime:         time.Now(),
-						DriverName:          "string",
-						DriverPhone:         "string",
-						VehicleLicensePlate: "string",
-						VehicleModel:        "string",
-						DropoffPointId:      11,
-						WarehouseId:         5,
-					},
-				},
-			},
-			`{
-				"arrival_pass_ids": [
-				  "1111"
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&CreateReturnParams{},
-			`{
-				"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.Passes().CreateReturn(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &CreateReturnResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestUpdateReturn(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *UpdateReturnParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&UpdateReturnParams{
-				ArrivalPasses: []ReturnArrivalPass{
-					{
-						ArrivalTime:         time.Now(),
-						DriverName:          "string",
-						DriverPhone:         "string",
-						VehicleLicensePlate: "string",
-						VehicleModel:        "string",
-						DropoffPointId:      11,
-						WarehouseId:         5,
-					},
-				},
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&UpdateReturnParams{},
-			`{
-				"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.Passes().UpdateReturn(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &UpdateReturnResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestDeleteReturn(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *DeleteReturnParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&DeleteReturnParams{
-				ArrivalPassIds: []int64{456},
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&DeleteReturnParams{},
-			`{
-				"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.Passes().DeleteReturn(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &DeleteReturnResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}

ozon/polygons.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Polygons struct {
@@ -85,3 +85,27 @@ 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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestCreateDeliveryPolygon(t *testing.T) {
@@ -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]]]",
 			},
 			`{
-				"polygon_id": 1323
+				"polygonId": "1323"
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -47,11 +47,8 @@ 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)
 		}
@@ -105,11 +102,53 @@ func TestLinkDeliveryMethodToPolygon(t *testing.T) {
 		resp, err := c.Polygons().Link(ctx, test.params)
 		if err != nil {
 			t.Error(err)
-			continue
 		}
 
-		compareJsonResponse(t, test.response, &LinkDeliveryMethodToPolygonResponse{})
+		if resp.StatusCode != test.statusCode {
-
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+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)
+		}
+
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
 		}

ozon/promotions.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Promotions struct {
@@ -52,7 +52,7 @@ type GetAvailablePromotionsResult struct {
 	ParticipatingProductsCount float64 `json:"participating_products_count"`
 
 	// Whether or not you participate in the promotion
-	IsParticipating bool `json:"is_participating"`
+	IsParticipating bool `json:"participating"`
 
 	// Indication that customers need a promo code to participate in the promotion
 	IsVoucherAction bool `json:"is_voucher_action"`
@@ -98,7 +98,7 @@ type AddProductToPromotionParams struct {
 
 type AddProductToPromotionProduct struct {
 	// Product identifier
-	ProductId float64 `json:"product_id"`
+	ProductId float64 `json:"produt_id"`
 
 	// Promotional product price
 	ActionPrice float64 `json:"action_price"`
@@ -136,7 +136,7 @@ func (c Promotions) AddToPromotion(ctx context.Context, params *AddProductToProm
 
 	resp := &AddProductToPromotionResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -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,omitempty"`
+	Offset float64 `json:"offset"`
 }
 
 type ProductsAvailableForPromotionResponse struct {
@@ -183,7 +183,7 @@ type PromotionProduct struct {
 	ActionPrice float64 `json:"action_price"`
 
 	// Maximum possible promotional product price
-	MaxActionPrice float64 `json:"max_action_price"`
+	MaxActionType float64 `json:"max_action_type"`
 
 	// 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,omitempty"`
+	Offset float64 `json:"offset"`
 }
 
 type ProductsInPromotionResponse struct {
 	core.CommonResponse
 
 	// Method result
-	Result ProductsInPromotionResult `json:"result"`
+	Result ProductsInPromotionResult `json:"reuslt"`
 }
 
 type ProductsInPromotionResult struct {
@@ -297,6 +297,196 @@ func (c Promotions) RemoveProduct(ctx context.Context, params *RemoveProductFrom
 	return resp, nil
 }
 
+type ListHotSalePromotionsResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result []ListHotSalePromotionsResult `json:"result"`
+}
+
+type ListHotSalePromotionsResult struct {
+	// Promotion end date
+	DateEnd string `json:"date_end"`
+
+	// Promotion start date
+	DateStart string `json:"date_start"`
+
+	// Promotion description
+	Description string `json:"description"`
+
+	// Promotion freeze date.
+	//
+	// If the field is filled, the seller can't increase prices, change the list of products,
+	// or decrease the number of product units in the promotion.
+	//
+	// The seller can lower prices and increase the product units number in the promotion
+	FreezeDate string `json:"freeze_date"`
+
+	// Hot Sale promotion identifier
+	HotsaleId float64 `json:"hotsale_id"`
+
+	// Indication that you participate in this promotion
+	IsParticipating bool `json:"is_participating"`
+
+	// Promotion name
+	Title string `json:"title"`
+}
+
+// List of available Hot Sale promotions
+func (c Promotions) ListHotSalePromotions(ctx context.Context) (*ListHotSalePromotionsResponse, error) {
+	url := "/v1/actions/hotsales/list"
+
+	resp := &ListHotSalePromotionsResponse{}
+
+	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 ProductsAvailableForHotSalePromotionParams struct {
+	// Hot Sale promotion identifier
+	HotSaleId float64 `json:"hotsale_id"`
+
+	// Number of elements in the response. Default value is 100
+	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"`
+}
+
+type ProductsAvailableForHotSalePromotionResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result ProductsAvailableForHotSalePromotionResult `json:"result"`
+}
+
+type ProductsAvailableForHotSalePromotionResult struct {
+	// Products list
+	Products []ProductsAvailableForHotSalePromotionResultProduct `json:"products"`
+
+	// Total number of products that are available for the promotion
+	Total float64 `json:"total"`
+}
+
+type ProductsAvailableForHotSalePromotionResultProduct struct {
+	// Promotional product price
+	ActionPrice float64 `json:"action_price"`
+
+	// Date when the product participates in the promotion in the YYYY-MM-DD format
+	DateDayPromo string `json:"date_day_promo"`
+
+	// Product identifier
+	Id float64 `json:"id"`
+
+	// Indication that product participates in the promotion
+	IsActive bool `json:"is_active"`
+
+	// Maximum possible promotional price of the product
+	MaxActionPrice float64 `json:"max_action_type"`
+
+	// Minimum number of product units in a stock discount type promotion
+	MinStock float64 `json:"min_stock"`
+
+	// Number of product units in a stock discount type promotion
+	Stock float64 `json:"stock"`
+}
+
+// Method for getting a list of products that can participate or are already participating in the Hot Sale promotion
+func (c Promotions) ProductsAvailableForHotSalePromotion(ctx context.Context, params *ProductsAvailableForHotSalePromotionParams) (*ProductsAvailableForHotSalePromotionResponse, error) {
+	url := "/v1/actions/hotsales/products"
+
+	resp := &ProductsAvailableForHotSalePromotionResponse{}
+
+	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 AddProductsToHotSaleParams struct {
+	// Hot Sale promotion identifier
+	HotSaleId float64 `json:"hotsale_id"`
+
+	// Products to be added to the promotion. The maximum number in one request is 100
+	Products []AddProductsToHotSaleProduct `json:"products"`
+}
+
+type AddProductsToHotSaleProduct struct {
+	// Promotional product price
+	ActionPrice float64 `json:"action_price"`
+
+	// Product identifier
+	ProductId float64 `json:"product_id"`
+
+	// Number of product units in a stock discount type promotion
+	Stock float64 `json:"stock"`
+}
+
+type ProductsToHotSaleResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result ProductsToHotSaleResult `json:"result"`
+}
+
+type ProductsToHotSaleResult struct {
+	// List of products that haven't been added to the promotion
+	Rejected []ProductsToHotSaleResultRejected `json:"rejected"`
+}
+
+type ProductsToHotSaleResultRejected struct {
+	//Product identifier
+	ProductId float64 `json:"product_id"`
+
+	// Reason why the product hasn't been added to the promotion
+	Reason string `json:"reason"`
+}
+
+func (c Promotions) AddProductsToHotSale(ctx context.Context, params *AddProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
+	url := "/v1/actions/hotsales/activate"
+
+	resp := &ProductsToHotSaleResponse{}
+
+	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 RemoveProductsToHotSaleParams struct {
+	// Hot Sale promotion identifier
+	HotSaleId float64 `json:"hotsale_id"`
+
+	// List of products identifiers. Maximum number of values in one request is 100
+	ProductIds []float64 `json:"product_ids"`
+}
+
+// Remove product from the Hot Sale promotion
+func (c Promotions) RemoveProductsToHotSale(ctx context.Context, params *RemoveProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
+	url := "/v1/actions/hotsales/activate"
+
+	resp := &ProductsToHotSaleResponse{}
+
+	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 ListDiscountRequestsParams struct {
 	// Discount request status
 	Status ListDiscountRequestsStatus `json:"status" default:"UNKNOWN"`

ozon/promotions_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetAvailablePromotions(t *testing.T) {
@@ -61,11 +61,8 @@ 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)
 		}
@@ -134,11 +131,8 @@ 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)
 		}
@@ -214,11 +208,8 @@ 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)
 		}
@@ -279,11 +270,8 @@ 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)
 		}
@@ -335,11 +323,8 @@ 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)
 		}
@@ -354,6 +339,236 @@ func TestRemoveProduct(t *testing.T) {
 	}
 }
 
+func TestListHotSalePromotions(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"},
+			`{
+				"result": [
+				  {
+					"date_end": "string",
+					"date_start": "string",
+					"description": "string",
+					"freeze_date": "string",
+					"hotsale_id": 0,
+					"is_participating": true,
+					"title": "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.Promotions().ListHotSalePromotions(ctx)
+		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 TestProductsAvailableForHotSalePromotion(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ProductsAvailableForHotSalePromotionParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ProductsAvailableForHotSalePromotionParams{
+				HotSaleId: 0,
+				Limit:     0,
+				Offset:    0,
+			},
+			`{
+				"result": {
+				  "products": [
+					{
+					  "action_price": 0,
+					  "date_day_promo": "string",
+					  "id": 0,
+					  "is_active": true,
+					  "max_action_price": 0,
+					  "min_stock": 0,
+					  "stock": 0
+					}
+				  ],
+				  "total": 0
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ProductsAvailableForHotSalePromotionParams{},
+			`{
+				"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.Promotions().ProductsAvailableForHotSalePromotion(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 TestAddProductsToHotSale(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *AddProductsToHotSaleParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&AddProductsToHotSaleParams{
+				HotSaleId: 1234,
+				Products: []AddProductsToHotSaleProduct{
+					{
+						ActionPrice: 12,
+						ProductId:   111,
+						Stock:       45,
+					},
+				},
+			},
+			`{
+				"result": {
+				  "rejected": [
+					{
+					  "product_id": 0,
+					  "reason": "string"
+					}
+				  ]
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&AddProductsToHotSaleParams{},
+			`{
+				"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.Promotions().AddProductsToHotSale(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 TestRemoveProductsToHotSale(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *RemoveProductsToHotSaleParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&RemoveProductsToHotSaleParams{
+				HotSaleId:  12345,
+				ProductIds: []float64{111},
+			},
+			`{
+				"result": {
+				  "rejected": [
+					{
+					  "product_id": 0,
+					  "reason": "string"
+					}
+				  ]
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&RemoveProductsToHotSaleParams{},
+			`{
+				"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.Promotions().RemoveProductsToHotSale(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 TestListDiscountRequests(t *testing.T) {
 	t.Parallel()
 
@@ -433,11 +648,8 @@ 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)
 		}
@@ -500,11 +712,8 @@ 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)
 		}
@@ -567,11 +776,8 @@ 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/quants.go

@@ -1,356 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-type Quants struct {
-	client *core.Client
-}
-
-type ListQuantsParams struct {
-	// Cursor for the next data sample
-	Cursor string `json:"cursor"`
-
-	// Filter
-	Filter ListQuantsFilter `json:"filter"`
-
-	// Maximum number of values in the response
-	Limit int32 `json:"limit"`
-
-	// Parameter by which products will be sorted
-	Sort string `json:"sort"`
-
-	// Sorting direction
-	SortDir string `json:"sort_dir"`
-}
-
-type ListQuantsFilter struct {
-	// MOQ creation period
-	CreatedAt *ListQuantsFilterTime `json:"created_at"`
-
-	// Time for MOQ assembly
-	Cutoff *ListQuantsFilterTime `json:"cutoff"`
-
-	// Destination point identifier
-	DestinationPlaceId int64 `json:"destination_place_id"`
-
-	// MOQ inventory identifiers
-	InvQuantIds []string `json:"inv_quants_ids"`
-
-	// Product identifier in the seller's system
-	OfferId string `json:"offer_id"`
-
-	// Product name
-	SKUName string `json:"sku_name"`
-
-	// MOQ statuses
-	Statuses []string `json:"statuses"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-}
-
-type ListQuantsFilterTime struct {
-	// Start date
-	From string `json:"from"`
-
-	// End date
-	To string `json:"to"`
-}
-
-type ListQuantsResponse struct {
-	core.CommonResponse
-
-	Result ListQuantsResult `json:"result"`
-}
-
-type ListQuantsResult struct {
-	// Cursor for the next data sample
-	Cursor string `json:"cursor"`
-
-	// Indication that the response returned only a part of characteristic values
-	HasNext bool `json:"has_next"`
-
-	// MOQs list
-	Quants []Quant `json:"quants"`
-}
-
-type Quant struct {
-	// List of available actions with MOQ
-	AvailableActions []string `json:"available_actions"`
-
-	// Date until which the leftover stock amount must be specified
-	AwaitingStockDueDate string `json:"awaiting_stock_due_date"`
-
-	// MOQ cancellation reason
-	CancelReason `json:"cancel_reason"`
-
-	// Seller company identifier
-	CompanyId int64 `json:"company_id"`
-
-	// MOQ creation date
-	CreatedAt string `json:"created_at"`
-
-	// Current number of shipments in the MOQ
-	CurrentPostingsCount int64 `json:"current_postings_count"`
-
-	// Time until which the MOQ must be assembled
-	Cutoff string `json:"cutoff"`
-
-	// Delivery method name
-	DeliveryMethod string `json:"delivery_method_name"`
-
-	// Destination point identifier
-	DestinationPlaceId int64 `json:"destination_place_id"`
-
-	// Destination point name
-	DestinationPlaceName string `json:"destination_place_name"`
-
-	// MOQ filling percentage
-	FillingPercent float32 `json:"filling_percent"`
-
-	// Date when the shipments start to get canceled if the MOQ is not reserved
-	FirstPostingCancellationDate string `json:"first_posting_cancellation_date"`
-
-	// MOQ identifier in Ozon system
-	Id int64 `json:"id"`
-
-	// MOQ inventory identifier
-	InvQuantId int64 `json:"inv_quant_id"`
-
-	// Date of the last MOQ status change
-	LastStatusChangeAt string `json:"last_status_change_at"`
-
-	// Product identifier in the seller's system
-	OfferId string `json:"offer_id"`
-
-	// Total cost of products in the MOQ
-	ProductsPrice float32 `json:"products_price"`
-
-	// Start date of MOQ filling
-	QuantumStartDate string `json:"quantum_start_date"`
-
-	// Product SKU
-	SKU int64 `json:"sku"`
-
-	// Product name
-	SKUName string `json:"sku_name"`
-
-	// MOQ statuses
-	Status string `json:"status"`
-
-	// Required number of products in the MOQ
-	TargetPostingsCount int64 `json:"target_postings_count"`
-
-	// Delivery service name
-	TPLProviderName string `json:"tpl_provider_name"`
-
-	// MOQ type: box or pallet
-	Type string `json:"type"`
-
-	// Seller warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-
-	// Seller warehouse name
-	WarehouseName string `json:"warehouse_name"`
-}
-
-type CancelReason struct {
-	// Identifier of MOQ cancellation reason
-	Id int64 `json:"cancel_reason_id"`
-
-	// Cancellation reason name
-	Name string `json:"cancel_reason_name"`
-
-	// Cancellation initiator
-	Responsible string `json:"responsible"`
-}
-
-// You can leave feedback on this method in the comments section to the discussion in the Ozon for dev community.
-func (q Quants) List(ctx context.Context, params *ListQuantsParams) (*ListQuantsResponse, error) {
-	url := "/v1/quant/list"
-
-	resp := &ListQuantsResponse{}
-
-	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type GetQuantParams struct {
-	// MOQ inventory identifier
-	QuantId int64 `json:"inv_quant_id"`
-}
-
-type GetQuantResponse struct {
-	core.CommonResponse
-
-	// MOQ information
-	Result []GetQuantResult `json:"result"`
-}
-
-type GetQuantResult struct {
-	// Available actions
-	AvailableActions []string `json:"available_actions"`
-
-	// Date until which the leftover stock amount must be specified
-	AwaitingStockDueDate time.Time `json:"awaiting_stock_due_date"`
-
-	// Shipment cancellation reason
-	CancelReason CancelReason `json:"cancel_reason"`
-
-	// Current number of shipments in the MOQ
-	CurrentPostingsCount int64 `json:"current_postings_count"`
-
-	// Time until which the MOQ must be assembled
-	Cutoff time.Time `json:"cutoff"`
-
-	// Delivery method name
-	DeliveryMethodName string `json:"delivery_method_name"`
-
-	// Destination point identifier
-	DestinationPlaceId int64 `json:"destination_place_id"`
-
-	// Destination point name
-	DestinationPlaceName string `json:"destination_place_name"`
-
-	// MOQ filling percentage
-	FillingPercent float32 `json:"filling_percent"`
-
-	// Date when the shipments start to get canceled if the MOQ isn't reserved
-	FirstPostingCancellationDate time.Time `json:"first_posting_cancellation_date"`
-
-	// MOQ identifier
-	Id int64 `json:"id"`
-
-	// MOQ inventory identifier
-	QuantId int64 `json:"inv_quant_id"`
-
-	// Product identifier in the seller's system
-	OfferId string `json:"offer_id"`
-
-	// Shipments
-	Postings []GetQuantResultPosting `json:"postings"`
-
-	// Link to product photo
-	ProductPictureURL string `json:"product_picture_url"`
-
-	// Total price of products in the MOQ
-	ProductsPrice float32 `json:"products_price"`
-
-	// Start date of MOQ filling
-	QuantumStartDate time.Time `json:"quantum_start_date"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Product name
-	SKUName string `json:"sku_name"`
-
-	// MOQ statuses
-	Status string `json:"status"`
-
-	// Required number of products in the MOQ
-	TargetPostingsCount int64 `json:"target_postings_count"`
-
-	// Delivery service name
-	TPLProviderName string `json:"tpl_provider_name"`
-
-	// MOQ type: box or pallet
-	Type string `json:"type"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-
-	// Warehouse name
-	WarehouseName string `json:"warehouse_name"`
-}
-
-type GetQuantResultPosting struct {
-	// Shipment cancellation reason
-	CancelReason CancelReason `json:"cancel_reason"`
-
-	// Shipment number
-	PostingNumber string `json:"posting_number"`
-
-	// Total price of products in the MOQ
-	ProductsPrice float32 `json:"products_price"`
-
-	// Status text
-	StatusAlias string `json:"status_alias"`
-
-	// Status identifier
-	StatusId int64 `json:"status_id"`
-}
-
-func (q Quants) Get(ctx context.Context, params *GetQuantParams) (*GetQuantResponse, error) {
-	url := "/v1/quant/get"
-
-	resp := &GetQuantResponse{}
-
-	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type ShipQuantParams struct {
-	// MOQ inventory identifier
-	QuantId int64 `json:"quant_id"`
-}
-
-type ShipQuantResponse struct {
-	core.CommonResponse
-}
-
-func (q Quants) Ship(ctx context.Context, params *ShipQuantParams) (*ShipQuantResponse, error) {
-	url := "/v1/quant/ship"
-
-	resp := &ShipQuantResponse{}
-
-	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}
-
-type StatusQuantParams struct {
-	// MOQ inventory identifier
-	QuantId int64 `json:"inv_quant_id"`
-}
-
-type StatusQuantResponse struct {
-	core.CommonResponse
-
-	// MOQ statuses
-	Status string `json:"status"`
-}
-
-func (q Quants) Status(ctx context.Context, params *StatusQuantParams) (*StatusQuantResponse, error) {
-	url := "/v1/quant/ship"
-
-	resp := &StatusQuantResponse{}
-
-	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
-	if err != nil {
-		return nil, err
-	}
-	response.CopyCommonResponse(&resp.CommonResponse)
-
-	return resp, nil
-}

ozon/quants_test.go

@@ -1,303 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-func TestListQuants(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListQuantsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListQuantsParams{
-				Cursor: "string",
-				Filter: ListQuantsFilter{
-					InvQuantIds:        []string{"string"},
-					DestinationPlaceId: 123,
-					OfferId:            "string",
-					SKUName:            "string",
-					Statuses:           []string{"unknown"},
-					WarehouseId:        456,
-				},
-				Limit:   10,
-				Sort:    "string",
-				SortDir: "string",
-			},
-			`{
-				"result": {
-				  "cursor": "string",
-				  "has_next": true,
-				  "quants": [
-					{
-					  "available_actions": [
-						"string"
-					  ],
-					  "awaiting_stock_due_date": "2019-08-24T14:15:22Z",
-					  "cancel_reason": {
-						"cancel_reason_id": 0,
-						"cancel_reason_name": "string",
-						"responsible": "string"
-					  },
-					  "company_id": 0,
-					  "created_at": "2019-08-24T14:15:22Z",
-					  "current_postings_count": 0,
-					  "cutoff": "2019-08-24T14:15:22Z",
-					  "delivery_method_name": "string",
-					  "destination_place_id": 0,
-					  "destination_place_name": "string",
-					  "filling_percent": 0,
-					  "first_posting_cancellation_date": "2019-08-24T14:15:22Z",
-					  "id": 0,
-					  "inv_quant_id": 0,
-					  "last_status_change_at": "2019-08-24T14:15:22Z",
-					  "offer_id": "string",
-					  "products_price": 0,
-					  "quantum_start_date": "2019-08-24T14:15:22Z",
-					  "sku": 0,
-					  "sku_name": "string",
-					  "status": "unknown",
-					  "target_postings_count": 0,
-					  "tpl_provider_name": "string",
-					  "type": "string",
-					  "warehouse_id": 0,
-					  "warehouse_name": "string"
-					}
-				  ]
-				}
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListQuantsParams{},
-			`{
-				"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.Quants().List(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListQuantsResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestGetQuant(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetQuantParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetQuantParams{
-				QuantId: 456,
-			},
-			`{
-				"result": [
-				  {
-					"available_actions": [
-					  "string"
-					],
-					"awaiting_stock_due_date": "2019-08-24T14:15:22Z",
-					"cancel_reason": {
-					  "cancel_reason_id": 0,
-					  "cancel_reason_name": "string",
-					  "responsible": "string"
-					},
-					"current_postings_count": 0,
-					"cutoff": "2019-08-24T14:15:22Z",
-					"delivery_method_name": "string",
-					"destination_place_id": 0,
-					"destination_place_name": "string",
-					"filling_percent": 0,
-					"first_posting_cancellation_date": "2019-08-24T14:15:22Z",
-					"id": 0,
-					"inv_quant_id": 0,
-					"offer_id": "string",
-					"postings": [
-					  {
-						"cancel_reason": {
-						  "cancel_reason_id": 0,
-						  "cancel_reason_name": "string",
-						  "responsible": "string"
-						},
-						"posting_number": "string",
-						"products_price": 0,
-						"status_alias": "string",
-						"status_id": 0
-					  }
-					],
-					"product_picture_url": "string",
-					"products_price": 0,
-					"quantum_start_date": "2019-08-24T14:15:22Z",
-					"sku": 0,
-					"sku_name": "string",
-					"status": "unknown",
-					"target_postings_count": 0,
-					"tpl_provider_name": "string",
-					"type": "string",
-					"warehouse_id": 0,
-					"warehouse_name": "string"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetQuantParams{},
-			`{
-				"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.Quants().Get(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetQuantResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestShipQuant(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ShipQuantParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ShipQuantParams{
-				QuantId: 456,
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ShipQuantParams{},
-			`{
-				"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.Quants().Ship(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ShipQuantResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestStatusQuant(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *StatusQuantParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&StatusQuantParams{
-				QuantId: 456,
-			},
-			`{
-				"status": "unknown"
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&StatusQuantParams{},
-			`{
-				"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.Quants().Status(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &StatusQuantResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}

ozon/rating.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Rating struct {
@@ -17,25 +17,6 @@ type GetCurrentSellerRatingInfoResponse struct {
 
 	// Rating groups list
 	Groups []GetCurrentSellerRatingInfoGroup `json:"groups"`
-
-	// Localization index details.
-	// If you had no sales in the last 14 days,
-	// the parameter fields will be empty
-	LocalizationIndex []LocalizationIndex `json:"localization_index"`
-
-	// 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 LocalizationIndex struct {
-	// Date of localization index calculation
-	CalculationDate time.Time `json:"calculation_date"`
-
-	// Localization index value
-	LocalizationPercentage int32 `json:"localization_percentage"`
 }
 
 type GetCurrentSellerRatingInfoGroup struct {
@@ -44,6 +25,12 @@ 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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetCurrentRatingInfo(t *testing.T) {
@@ -41,12 +41,6 @@ func TestGetCurrentRatingInfo(t *testing.T) {
 					]
 				  }
 				],
-				"localization_index": [
-					{
-						"calculation_date": "2019-08-24T14:15:22Z",
-						"localization_percentage": 0
-					}
-				],
 				"penalty_score_exceeded": true,
 				"premium": true
 			}`,
@@ -69,11 +63,8 @@ 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)
 		}
@@ -161,11 +152,8 @@ 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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Reports struct {
@@ -61,9 +61,6 @@ 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
@@ -129,11 +126,21 @@ type GetReportDetailResult struct {
 	// Array with the filters specified when the seller created the report
 	Params map[string]string `json:"params"`
 
-	// Report type
+	// Report type:
-	ReportType ReportType `json:"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 generation status
+	// Report generation status:
-	Status ReportInfoStatus `json:"status"`
+	//   - success
+	//   - failed
+	Status string `json:"status"`
 }
 
 // Returns information about a created report by its identifier
@@ -196,7 +203,7 @@ type GetFinancialResultResultCashflow struct {
 	Period GetFinancialResultResultCashflowPeriod `json:"period"`
 
 	// Sum of sold products prices
-	OrdersAmount float64 `json:"orders_amount"`
+	OrdersAmount float64 `json:"order_amount"`
 
 	// Sum of returned products prices
 	ReturnsAmount float64 `json:"returns_amount"`
@@ -448,9 +455,89 @@ 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,omitempty"`
+	Filter GetReturnsReportsFilter `json:"filter"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -463,15 +550,8 @@ type GetReturnsReportsFilter struct {
 	// Order delivery scheme: fbs — delivery from seller's warehouse
 	DeliverySchema string `json:"delivery_schema"`
 
-	// Date from which the data is displayed in the report.
+	// Order identifier
-	//
+	OrderId int64 `json:"order_id"`
-	// Available for the last three months only
-	DateFrom time.Time `json:"date_from"`
-
-	// Date up to which the data is displayed in the report.
-	//
-	// Available for the last three months only
-	DateTo time.Time `json:"date_to"`
 
 	// Order status
 	Status string `json:"status"`
@@ -480,17 +560,20 @@ type GetReturnsReportsFilter struct {
 type GetReturnsReportResponse struct {
 	core.CommonResponse
 
-	Result GetReturnsReportResult `json:"result"`
+	// Method result
+	Result GetReturnReportResult `json:"result"`
 }
 
-type GetReturnsReportResult struct {
+type GetReturnReportResult struct {
-	// Unique report identifier. The report is available for downloading within 3 days after making a request.
+	// Unique report identifier
 	Code string `json:"code"`
 }
 
-// Method for getting a report on FBO and FBS returns
+// The report contains information about returned products that were accepted from the customer, ready for pickup, or delivered to the seller.
+//
+// The method is only suitable for orders shipped from the seller's warehouse
 func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams) (*GetReturnsReportResponse, error) {
-	url := "/v2/report/returns/create"
+	url := "/v1/report/returns/create"
 
 	resp := &GetReturnsReportResponse{}
 
@@ -505,7 +588,7 @@ func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams)
 
 type GetShipmentReportParams struct {
 	// Filter
-	Filter *GetShipmentReportFilter `json:"filter,omitempty"`
+	Filter GetShipmentReportFilter `json:"filter"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -518,22 +601,19 @@ type GetShipmentReportFilter struct {
 	// Cancellation reason identifier
 	CancelReasonId []int64 `json:"cancel_reason_id"`
 
-	// The scheme of operation is FBO or FBS.
+	// Work scheme: FBO or FBS.
 	//
-	// Only one of the parameters can be passed to the array per query:
+	// To get an FBO scheme report, pass fbo in this parameter. For an FBS scheme report pass fbs
-	//
-	// fbo - to get a report by FBO scheme,
-	// fbs - to get a report by FBS scheme
 	DeliverySchema []string `json:"delivery_schema"`
 
 	// Product identifier
 	OfferId string `json:"offer_id"`
 
 	// Order processing start date and time
-	ProcessedAtFrom *core.TimeFormat `json:"processed_at_from,omitempty"`
+	ProcessedAtFrom time.Time `json:"processed_at_from"`
 
 	// Time when the order appeared in your personal account
-	ProcessedAtTo *core.TimeFormat `json:"processed_at_to,omitempty"`
+	ProcessedAtTo time.Time `json:"processed_at_to"`
 
 	// Product identifier in the Ozon system, SKU
 	SKU []int64 `json:"sku"`
@@ -606,34 +686,56 @@ func (c Reports) IssueOnDiscountedProducts(ctx context.Context) (*IssueOnDiscoun
 	return resp, nil
 }
 
-type GetFBSStocksParams struct {
+type ReportOnDiscountedProductsParams 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"`
 }
 
-// Report with information about the number of available and reserved products in stock.
+type ReportOnDiscountedProductsResponse struct {
-//
+	core.CommonResponse
-// The method returns a report identifier.
-// To get the report, send the identifier in the request of the `/v1/report/info` method.
-func (c Reports) GetFBSStocks(ctx context.Context, params *GetFBSStocksParams) (*GetFBSStocksResponse, error) {
-	url := "/v1/report/warehouse/stock"
 
-	resp := &GetFBSStocksResponse{}
+	// 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{}
 
 	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {

ozon/reports_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetList(t *testing.T) {
@@ -74,11 +74,8 @@ 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)
 		}
@@ -116,7 +113,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.68826Z"
+				  "created_at": "2021-11-25T14:54:55.688260Z"
 				}
 			}`,
 		},
@@ -139,11 +136,8 @@ 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)
 		}
@@ -264,7 +258,8 @@ func TestGetFinancialReport(t *testing.T) {
 					},
 					"end_balance_amount": 0
 				  }
-				}
+				},
+				"page_count": 15
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -286,11 +281,8 @@ 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)
 		}
@@ -344,10 +336,116 @@ func TestGetProductsReport(t *testing.T) {
 		resp, err := c.Reports().GetProducts(ctx, test.params)
 		if err != nil {
 			t.Error(err)
-			continue
 		}
 
-		compareJsonResponse(t, test.response, &GetProductsReportResponse{})
+		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)
+		}
 
 		if resp.StatusCode != test.statusCode {
 			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
@@ -375,13 +473,13 @@ 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",
 				},
 			},
 			`{
 				"result": {
-				  "code": "REPORT_seller_products_924336_1720170405_a9ea2f27-a473-4b13-99f9-d0cfcb5b1a69"
+				  "code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
 				}
 			}`,
 		},
@@ -404,7 +502,6 @@ func TestGetReturnsReport(t *testing.T) {
 		resp, err := c.Reports().GetReturns(ctx, test.params)
 		if err != nil {
 			t.Error(err)
-			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -412,7 +509,9 @@ func TestGetReturnsReport(t *testing.T) {
 		}
 
 		if resp.StatusCode == http.StatusOK {
-			compareJsonResponse(t, test.response, &GetReturnsReportResponse{})
+			if resp.Result.Code == "" {
+				t.Errorf("Code cannot be empty")
+			}
 		}
 	}
 }
@@ -431,10 +530,10 @@ 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.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
+					ProcessedAtFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"),
-					ProcessedAtTo:   core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
+					ProcessedAtTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"),
 				},
 			},
 			`{
@@ -462,11 +561,8 @@ 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)
 		}
@@ -513,7 +609,6 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 		resp, err := c.Reports().IssueOnDiscountedProducts(ctx)
 		if err != nil {
 			t.Error(err)
-			continue
 		}
 
 		if resp.StatusCode != test.statusCode {
@@ -521,7 +616,6 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 		}
 
 		if resp.StatusCode == http.StatusOK {
-			compareJsonResponse(t, test.response, &IssueOnDiscountedProductsResponse{})
 			if resp.Code == "" {
 				t.Errorf("Code cannot be empty")
 			}
@@ -529,26 +623,28 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
 	}
 }
 
-func TestGetFBSStocks(t *testing.T) {
+func TestReportOnDiscountedProducts(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
 		statusCode int
 		headers    map[string]string
-		params     *GetFBSStocksParams
+		params     *ReportOnDiscountedProductsParams
 		response   string
 	}{
 		// Test Ok
 		{
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetFBSStocksParams{
+			&ReportOnDiscountedProductsParams{
-				Language:     "EN",
+				Code: "d55f4517-8347-4e24-9d93-d6e736c1c07c",
-				WarehouseIds: []int64{123},
 			},
 			`{
-				"result": {
+				"report": {
-					"code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
+				  "created_at": "2022-10-04T10:07:08.146Z",
+				  "error": "string",
+				  "file": "string",
+				  "status": "string"
 				}
 			}`,
 		},
@@ -556,7 +652,7 @@ func TestGetFBSStocks(t *testing.T) {
 		{
 			http.StatusUnauthorized,
 			map[string]string{},
-			&GetFBSStocksParams{},
+			&ReportOnDiscountedProductsParams{},
 			`{
 				"code": 16,
 				"message": "Client-Id and Api-Key headers are required"
@@ -568,14 +664,60 @@ func TestGetFBSStocks(t *testing.T) {
 		c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
 
 		ctx, _ := context.WithTimeout(context.Background(), testTimeout)
-		resp, err := c.Reports().GetFBSStocks(ctx, test.params)
+		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)
 		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/reviews.go

@@ -1,334 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-type Reviews struct {
-	client *core.Client
-}
-
-type LeaveCommentParams struct {
-	// Review status update
-	MarkReviewAsProcesses bool `json:"mark_review_as_processed"`
-
-	// Identifier of the parent comment you're replying to
-	ParentCommentId string `json:"parent_comment_id"`
-
-	// Review identifier
-	ReviewId string `json:"review_id"`
-
-	// Comment text
-	Text string `json:"text"`
-}
-
-type LeaveCommentResponse struct {
-	core.CommonResponse
-
-	// Comment identifier
-	CommentId string `json:"comment_id"`
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) LeaveComment(ctx context.Context, params *LeaveCommentParams) (*LeaveCommentResponse, error) {
-	url := "/v1/review/comment/create"
-
-	resp := &LeaveCommentResponse{}
-
-	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 DeleteCommentParams struct {
-	// Comment identifier
-	CommentId string `json:"comment_id"`
-}
-
-type DeleteCommentResponse struct {
-	core.CommonResponse
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) DeleteComment(ctx context.Context, params *DeleteCommentParams) (*DeleteCommentResponse, error) {
-	url := "/v1/review/comment/delete"
-
-	resp := &DeleteCommentResponse{}
-
-	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 ListCommentsParams struct {
-	// Limit of values in the response. Minimum is 20. Maximum is 100
-	Limit int32 `json:"limit"`
-
-	// Number of elements that is skipped in the response.
-	// For example, if offset = 10, the response starts with the 11th element found
-	Offset int32 `json:"offset"`
-
-	// Review identifier
-	ReviewId string `json:"review_id"`
-
-	// 	Sorting direction
-	SortDir Order `json:"sort_dir"`
-}
-
-type ListCommentsResponse struct {
-	core.CommonResponse
-
-	// Number of elements in the response
-	Offset int32 `json:"offset"`
-
-	// Comment details
-	Comments []Comment `json:"comments"`
-}
-
-type Comment struct {
-	// Comment identifier
-	Id string `json:"id"`
-
-	// true, if the comment was left by an official, false if a customer left it
-	IsOfficial bool `json:"is_official"`
-
-	// true, if the comment was left by a seller, false if a customer left it
-	IsOwner bool `json:"is_owner"`
-
-	// Identifier of the parent comment to reply to
-	ParentCommentId string `json:"parent_comment_id"`
-
-	// Date the comment was published
-	PublishedAt time.Time `json:"published_at"`
-
-	// Comment text
-	Text string `json:"text"`
-}
-
-// Only available to sellers with the Premium Plus subscription
-//
-// Method returns information about comments on reviews that have passed moderation
-func (c Reviews) ListComments(ctx context.Context, params *ListCommentsParams) (*ListCommentsResponse, error) {
-	url := "/v1/review/comment/list"
-
-	resp := &ListCommentsResponse{}
-
-	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
-}
-
-// Only available to sellers with the Premium Plus subscription
-type ChangeStatusParams struct {
-	// Array with review identifiers from 1 to 100
-	ReviewIds []string `json:"review_ids"`
-
-	// Review status
-	Status string `json:"status"`
-}
-
-type ChangeStatusResponse struct {
-	core.CommonResponse
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) ChangeStatus(ctx context.Context, params *ChangeStatusParams) (*ChangeStatusResponse, error) {
-	url := "/v1/review/change-status"
-
-	resp := &ChangeStatusResponse{}
-
-	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 CountReviewsResponse struct {
-	core.CommonResponse
-
-	// Number of processed review
-	Processed int32 `json:"processed"`
-
-	// Number of all reviews
-	Total int32 `json:"total"`
-
-	// Number of unprocessed reviews
-	Unprocessed int32 `json:"unprocessed"`
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) Count(ctx context.Context) (*CountReviewsResponse, error) {
-	url := "/v1/review/count"
-
-	resp := &CountReviewsResponse{}
-
-	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 GetReviewParams struct {
-	// Review identifier
-	ReviewId string `json:"review_id"`
-}
-
-type GetReviewResponse struct {
-	core.CommonResponse
-
-	ReviewDetails
-
-	// Number of dislikes on the review
-	DislikesAmount int32 `json:"dislikes_amount"`
-
-	// Number of likes on the review
-	LikesAmount int32 `json:"likes_amount"`
-
-	// Image details
-	Photos []ReviewPhoto `json:"photos"`
-
-	// Video details
-	Videos []ReviewVideo `json:"videos"`
-}
-
-type ReviewDetails struct {
-	// Number of comments on the review
-	CommentsAmount int32 `json:"comments_amount"`
-
-	// Review identifier
-	Id string `json:"id"`
-
-	// true, if the review affects the rating calculation
-	IsRatingParticipant bool `json:"is_rating_participant"`
-
-	// Status of the order for which the customer left a review
-	OrderStatus string `json:"order_status"`
-
-	// Number of images in the review
-	PhotosAmount int32 `json:"photos_amount"`
-
-	// Review publication date
-	PublishedAt time.Time `json:"published_at"`
-
-	// Review rating
-	Rating int32 `json:"rating"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Review status
-	Status string `json:"status"`
-
-	// Review text
-	Text string `json:"text"`
-
-	// Number of videos for the review
-	VideosAmount int32 `json:"videos_amount"`
-}
-
-type ReviewPhoto struct {
-	// Height
-	Height int32 `json:"height"`
-
-	// Link to image
-	URL string `json:"url"`
-
-	// Width
-	Width int32 `json:"width"`
-}
-
-type ReviewVideo struct {
-	// Height
-	Height int64 `json:"height"`
-
-	// Link to video preview
-	PreviewURL string `json:"preview_url"`
-
-	// Link to short video
-	ShortVideoPreviewURL string `json:"short_video_preview_url"`
-
-	// Video link
-	URL string `json:"url"`
-
-	// Width
-	Width int64 `json:"width"`
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) Get(ctx context.Context, params *GetReviewParams) (*GetReviewResponse, error) {
-	url := "/v1/review/info"
-
-	resp := &GetReviewResponse{}
-
-	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 ListReviewsParams struct {
-	// Identifier of the last review on the page
-	LastId string `json:"last_id"`
-
-	// Number of reviews in the response. Minimum is 20, maximum is 100
-	Limit int32 `json:"limit"`
-
-	// Sorting direction
-	SortDir Order `json:"sort_dir"`
-
-	// Review statuses
-	Status string `json:"status"`
-}
-
-type ListReviewsResponse struct {
-	core.CommonResponse
-
-	// true, if not all reviews were returned in the response
-	HasNext bool `json:"has_next"`
-
-	// Identifier of the last review on the page
-	LastId string `json:"last_id"`
-
-	// Review details
-	Reviews []ReviewDetails `json:"reviews"`
-}
-
-// Only available to sellers with the Premium Plus subscription
-func (c Reviews) List(ctx context.Context, params *ListReviewsParams) (*ListReviewsResponse, error) {
-	url := "/v1/review/list"
-
-	resp := &ListReviewsResponse{}
-
-	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/reviews_test.go

@@ -1,416 +0,0 @@
-package ozon
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	core "git.denco.store/fakz9/ozon-api-client"
-)
-
-func TestLeaveComment(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *LeaveCommentParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&LeaveCommentParams{
-				MarkReviewAsProcesses: true,
-				ParentCommentId:       "string",
-				ReviewId:              "string1",
-				Text:                  "some string",
-			},
-			`{
-				"comment_id": "string"
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&LeaveCommentParams{},
-			`{
-				"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.Reviews().LeaveComment(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &LeaveCommentResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestDeleteComment(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *DeleteCommentParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&DeleteCommentParams{
-				CommentId: "string",
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&DeleteCommentParams{},
-			`{
-				"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.Reviews().DeleteComment(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &DeleteCommentResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestListComments(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListCommentsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListCommentsParams{
-				Limit:    0,
-				Offset:   0,
-				ReviewId: "string",
-				SortDir:  Ascending,
-			},
-			`{
-				"comments": [
-				  {
-					"id": "string",
-					"is_official": true,
-					"is_owner": true,
-					"parent_comment_id": "string",
-					"published_at": "2019-08-24T14:15:22Z",
-					"text": "string"
-				  }
-				],
-				"offset": 0
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListCommentsParams{},
-			`{
-				"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.Reviews().ListComments(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListCommentsResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestChangeStatus(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ChangeStatusParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ChangeStatusParams{
-				ReviewIds: []string{"string"},
-				Status:    "PROCESSED",
-			},
-			`{}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ChangeStatusParams{},
-			`{
-				"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.Reviews().ChangeStatus(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ChangeStatusResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestCountReviews(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"},
-			`{
-				"processed": 2,
-				"total": 3,
-				"unprocessed": 1
-			}`,
-		},
-		// 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.Reviews().Count(ctx)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &CountReviewsResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestGetReview(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetReviewParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetReviewParams{
-				ReviewId: "string",
-			},
-			`{
-				"comments_amount": 0,
-				"dislikes_amount": 0,
-				"id": "string",
-				"is_rating_participant": true,
-				"likes_amount": 0,
-				"order_status": "string",
-				"photos": [
-				  {
-					"height": 0,
-					"url": "string",
-					"width": 0
-				  }
-				],
-				"photos_amount": 0,
-				"published_at": "2019-08-24T14:15:22Z",
-				"rating": 0,
-				"sku": 0,
-				"status": "string",
-				"text": "string",
-				"videos": [
-				  {
-					"height": 0,
-					"preview_url": "string",
-					"short_video_preview_url": "string",
-					"url": "string",
-					"width": 0
-				  }
-				],
-				"videos_amount": 0
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetReviewParams{},
-			`{
-				"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.Reviews().Get(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetReviewResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
-func TestListReviews(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListReviewsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListReviewsParams{
-				LastId:  "string",
-				Limit:   0,
-				SortDir: Ascending,
-				Status:  "ALL",
-			},
-			`{
-				"has_next": true,
-				"last_id": "string",
-				"reviews": [
-				  {
-					"comments_amount": 0,
-					"id": "string",
-					"is_rating_participant": true,
-					"order_status": "string",
-					"photos_amount": 0,
-					"published_at": "2019-08-24T14:15:22Z",
-					"rating": 0,
-					"sku": 0,
-					"status": "string",
-					"text": "string",
-					"videos_amount": 0
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListReviewsParams{},
-			`{
-				"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.Reviews().List(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListReviewsResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}

ozon/strategies.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Strategies struct {
@@ -24,7 +24,7 @@ type ListCompetitorsResponse struct {
 	core.CommonResponse
 
 	// List of competitors
-	Competitor []ListCompetitorsCompetitor `json:"competitor"`
+	Competitors []ListCompetitorsCompetitor `json:"competitors"`
 
 	// Total number of competitors
 	Total int32 `json:"total"`
@@ -32,10 +32,10 @@ type ListCompetitorsResponse struct {
 
 type ListCompetitorsCompetitor struct {
 	// Competitor's name
-	Name string `json:"competitor_name"`
+	Name string `json:"name"`
 
 	// Competitor identifier
-	Id int64 `json:"competitor_id"`
+	Id int64 `json:"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:"strategy_id"`
+	Id string `json:"id"`
 
 	// Strategy name
-	Name string `json:"strategy_name"`
+	Name string `json:"name"`
 
 	// Strategy type
 	Type StrategyType `json:"type"`
@@ -377,7 +377,6 @@ type GetCompetitorPriceResult struct {
 	StrategyCompetitorProductURL string `json:"strategy_competitor_product_url"`
 }
 
-// If you add a product to your pricing strategy, the method returns you the price and a link to the competitor's product
 func (c Strategies) GetCompetitorPrice(ctx context.Context, params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
 	url := "/v1/pricing-strategy/product/info"
 

ozon/strategies_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestListCompetitors(t *testing.T) {
@@ -54,11 +54,8 @@ 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)
 		}
@@ -117,11 +114,8 @@ 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)
 		}
@@ -164,7 +158,7 @@ func TestCreateStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "strategy_id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
+				  "id": "4f3a1d4c-5833-4f04-b69b-495cbc1f6f1c"
 				}
 			}`,
 		},
@@ -187,11 +181,8 @@ 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)
 		}
@@ -216,7 +207,7 @@ func TestInfoStrategy(t *testing.T) {
 			},
 			`{
 				"result": {
-				  "name": "test1",
+				  "strategy_name": "test1",
 				  "enabled": true,
 				  "update_type": "strategyItemsListChanged",
 				  "type": "COMP_PRICE",
@@ -252,11 +243,8 @@ 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)
 		}
@@ -323,11 +311,8 @@ 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)
 		}
@@ -376,11 +361,8 @@ 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)
 		}
@@ -433,11 +415,8 @@ 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)
 		}
@@ -499,11 +478,8 @@ 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)
 		}
@@ -556,11 +532,8 @@ 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)
 		}
@@ -608,11 +581,8 @@ 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)
 		}
@@ -657,11 +627,8 @@ 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)
 		}
@@ -705,11 +672,8 @@ 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

@@ -1,83 +0,0 @@
-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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 type Warehouses struct {
@@ -48,9 +48,6 @@ type GetListOfWarehousesResult struct {
 	// Indication that the warehouse accepts bulky products
 	IsKGT bool `json:"is_kgt"`
 
-	// true if the warehouse handles economy products
-	IsEconomy bool `json:"is_economy"`
-
 	// Indication that warehouse schedule can be changed
 	IsTimetableEditable bool `json:"is_timetable_editable"`
 
@@ -88,8 +85,7 @@ type GetListOfWarehousesResultFirstMile struct {
 	FirstMileType string `json:"first_mile_type"`
 }
 
-// Method returns the list of FBS and rFBS warehouses.
+// You do not need to specify any parameters in the request. Your company will be identified by the Warehouses ID
-// To get the list of FBO warehouses, use the /v1/cluster/list method.
 func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehousesResponse, error) {
 	url := "/v1/warehouse/list"
 
@@ -106,7 +102,7 @@ func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehous
 
 type GetListOfDeliveryMethodsParams struct {
 	// Search filter for delivery methods
-	Filter *GetListOfDeliveryMethodsFilter `json:"filter,omitempty"`
+	Filter GetListOfDeliveryMethodsFilter `json:"filter"`
 
 	// Number of items in a response. Maximum is 50, minimum is 1
 	Limit int64 `json:"limit"`
@@ -162,9 +158,6 @@ type GetListOfDeliveryMethodsResult struct {
 	// Delivery service identifier
 	ProviderId int64 `json:"provider_id"`
 
-	// Minimum time to package an order in minutes according to warehouse settings
-	SLACutIn int64 `json:"sla_cut_in"`
-
 	// Delivery method status:
 	//   - NEW—created,
 	//   - EDITED—being edited,
@@ -188,64 +181,7 @@ func (c Warehouses) GetListOfDeliveryMethods(ctx context.Context, params *GetLis
 
 	resp := &GetListOfDeliveryMethodsResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	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 ListForShippingParams struct {
-	// Supply type
-	FilterBySupplyType []string `json:"filter_by_supply_type"`
-
-	// Search by warehouse name. To search for pick-up points, specify the full name
-	Search string `json:"search"`
-}
-
-type ListForShippingResponse struct {
-	core.CommonResponse
-
-	// Warehouse search result
-	Search []ListForShippingSearch `json:"search"`
-}
-
-type ListForShippingSearch struct {
-	// Warehouse address
-	Address string `json:"address"`
-
-	// Warehouse coordinates
-	Coordinates Coordinates `json:"coordinates"`
-
-	// Warehouse name
-	Name string `json:"name"`
-
-	// Identifier of the warehouse, pick-up point, or sorting center
-	WarehouseId int64 `json:"warehouse_id"`
-
-	// Type of warehouse, pick-up point, or sorting center
-	WarehouseType string `json:"warehouse_type"`
-}
-
-type Coordinates struct {
-	// Latitude
-	Latitude float64 `json:"latitude"`
-
-	// Longitude
-	Longitude float64 `json:"longitude"`
-}
-
-// Use the method to find sorting centres, pick-up points, and drop-off points available for cross-docking and direct supplies.
-//
-// You can view the addresses of all points on the map and in a table in the Knowledge Base.
-func (c Warehouses) ListForShipping(ctx context.Context, params *ListForShippingParams) (*ListForShippingResponse, error) {
-	url := "/v1/warehouse/fbo/list"
-
-	resp := &ListForShippingResponse{}
-
-	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/warehouses_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	core "git.denco.store/fakz9/ozon-api-client"
+	core "github.com/diphantxm/ozon-api-client"
 )
 
 func TestGetListOfWarehouses(t *testing.T) {
@@ -21,37 +21,27 @@ func TestGetListOfWarehouses(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			`{
-    			"result": [
+				"result": [
-					{
+				  {
-						"warehouse_id": 1020000177886000,
+					"warehouse_id": 15588127982000,
-						"name": "This is a test",
+					"name": "Proffi (Панорама Групп)",
-						"is_rfbs": false,
+					"is_rfbs": false
-						"has_entrusted_acceptance": false,
+				  },
-						"first_mile_type": {
+				  {
-							"dropoff_point_id": "",
+					"warehouse_id": 22142605386000,
-							"dropoff_timeslot_id": 0,
+					"name": "Склад на производственной",
-							"first_mile_is_changing": false,
+					"is_rfbs": true
-							"first_mile_type": ""
+				  },
-						},
+				  {
-						"is_kgt": false,
+					"warehouse_id": 22208673494000,
-						"can_print_act_in_advance": false,
+					"name": "Тест 37349",
-						"min_working_days": 5,
+					"is_rfbs": true
-						"is_karantin": false,
+				  },
-						"has_postings_limit": false,
+				  {
-						"postings_limit": -1,
+					"warehouse_id": 22240462819000,
-						"working_days": [
+					"name": "Тест12",
-							1,
+					"is_rfbs": true
-							2,
+				  }
-							3,
-							4,
-							5,
-							6,
-							7
-						],
-						"min_postings_limit": 10,
-						"is_timetable_editable": true,
-						"status": "disabled"
-					}
 				]
 			}`,
 		},
@@ -73,11 +63,8 @@ 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)
 		}
@@ -109,7 +96,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,
@@ -127,8 +114,7 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 					"template_id": 0,
 					"warehouse_id": 15588127982000,
 					"created_at": "2019-04-04T15:22:31.048202Z",
-					"updated_at": "2021-08-15T10:21:44.854209Z",
+					"updated_at": "2021-08-15T10:21:44.854209Z"
-					"sla_cut_in": 1440
 				  }
 				],
 				"has_next": false
@@ -153,11 +139,8 @@ 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)
 		}
@@ -180,65 +163,3 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 		}
 	}
 }
-
-func TestListForShipping(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListForShippingParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListForShippingParams{
-				FilterBySupplyType: []string{"CREATE_TYPE_UNKNOWN"},
-				Search:             "string",
-			},
-			`{
-				"search": [
-				  {
-					"address": "string",
-					"coordinates": {
-					  "latitude": 0,
-					  "longitude": 0
-					},
-					"name": "string",
-					"warehouse_id": 0,
-					"warehouse_type": "WAREHOUSE_TYPE_UNKNOWN"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListForShippingParams{},
-			`{
-				"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.Warehouses().ListForShipping(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListForShippingResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}