17 Commits

Author SHA1 Message Date
Kirill
40dd5b86a8 Update October 26, 2023 (#46) 2023-10-27 20:06:33 +03:00
Antares
e5f2007a8e Fix fields in Finance methods (#45)
Fixed operation type field in getting transaction list
Fixed fields in params for getting finance realization report
2023-10-26 14:48:31 +03:00
Kirill
40d9fc32cb Update October 19, 2023 (#44) 2023-10-20 00:58:22 +03:00
Kirill
b07968d280 update/6-october-2023 - New Categories' methods version (#43) 2023-10-08 19:02:14 +03:00
Kirill
699d210296 update/4-october-2023 - Barcodes (#42) 2023-10-08 18:27:39 +03:00
Kirill
07d38a8456 remove deprecated method Delete Polygon (#41) 2023-09-05 23:11:43 +03:00
Kirill
0f1d0410bc update some methods description (#40) 2023-09-05 23:06:04 +03:00
Kirill
6d4d97e3c8 added comments on restrictions for seller without Premium subscription (#39) 2023-08-25 16:38:38 +03:00
Kirill
85543f45b0 update comments on price in Update Price params (#38) 2023-08-25 16:36:25 +03:00
Kirill
854d110ab1 Configure HttpClient, added context parameter to all methods (#37)
Context is needed to limit time of execution of a method. Previously, context was passed to structure and it was stored inside structure which is a bad practice. Now we need to pass context to function, which is a best practice
2023-08-05 13:50:34 +03:00
Kirill
018d40e641 Update August 2, 2023 (#34) 2023-08-03 21:02:08 +03:00
Kirill
72b25b673d fix tests (#33) 2023-08-02 01:57:08 +03:00
Kirill
cb24f19e83 fbs_sku and fbo_sku are now just sku (#32) 2023-08-02 01:19:21 +03:00
Kirill
588f4748a9 Update 28 July, 2023 (#31) 2023-07-31 00:20:07 +03:00
Kirill
651c39595f add tests for notification server errors (#30) 2023-07-29 02:59:03 +03:00
Kirill
6c1a5e35c0 enhance tests for notification server
enhance tests for notification server
2023-07-29 01:37:01 +03:00
diPhantxm
580a752012 enhance tests for notification server 2023-07-29 01:29:38 +03:00
46 changed files with 2067 additions and 871 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

111
ozon/barcodes.go Normal file
View File

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

141
ozon/barcodes_test.go Normal file
View File

@@ -0,0 +1,141 @@
package ozon
import (
"context"
"net/http"
"testing"
core "github.com/diphantxm/ozon-api-client"
)
func TestGenerateBarcodes(t *testing.T) {
t.Parallel()
tests := []struct {
statusCode int
headers map[string]string
params *GenerateBarcodesParams
response string
}{
// Test Ok
{
http.StatusOK,
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
&GenerateBarcodesParams{
ProductIds: []int64{123456789},
},
`{
"errors": [
{
"code": "code 200",
"error": "no error",
"barcode": "456",
"product_id": 123456789
}
]
}`,
},
// Test No Client-Id or Api-Key
{
http.StatusUnauthorized,
map[string]string{},
&GenerateBarcodesParams{},
`{
"code": 16,
"message": "Client-Id and Api-Key headers are required"
}`,
},
}
for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Barcodes().Generate(ctx, test.params)
if err != nil {
t.Error(err)
}
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)
}
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")
}
}
}
}
}

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -52,7 +53,8 @@ func TestListCertifiedBrands(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Brands().List(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Brands().List(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -62,7 +63,8 @@ func TestGetCancellationInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Cancellations().GetInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Cancellations().GetInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -171,7 +173,8 @@ func TestListCancellations(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Cancellations().List(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Cancellations().List(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -215,7 +218,8 @@ func TestApproveCancellations(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Cancellations().Approve(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Cancellations().Approve(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -259,7 +263,8 @@ func TestRejectCancellations(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Cancellations().Reject(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Cancellations().Reject(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -43,12 +44,12 @@ type ListOfAccordanceTypesResultHazard struct {
} }
// List of accordance types (version 2) // List of accordance types (version 2)
func (c Certificates) ListOfAccordanceTypes() (*ListOfAccordanceTypesResponse, error) { func (c Certificates) ListOfAccordanceTypes(ctx context.Context) (*ListOfAccordanceTypesResponse, error) {
url := "/v2/product/certificate/accordance-types/list" url := "/v2/product/certificate/accordance-types/list"
resp := &ListOfAccordanceTypesResponse{} resp := &ListOfAccordanceTypesResponse{}
response, err := c.client.Request(http.MethodGet, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -73,12 +74,12 @@ type DirectoryOfDocumentTypesResult struct {
} }
// Directory of document types // Directory of document types
func (c Certificates) DirectoryOfDocumentTypes() (*DirectoryOfDocumentTypesResponse, error) { func (c Certificates) DirectoryOfDocumentTypes(ctx context.Context) (*DirectoryOfDocumentTypesResponse, error) {
url := "/v1/product/certificate/types" url := "/v1/product/certificate/types"
resp := &DirectoryOfDocumentTypesResponse{} resp := &DirectoryOfDocumentTypesResponse{}
response, err := c.client.Request(http.MethodGet, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -119,12 +120,12 @@ type ListOfCertifiedCategoriesResultCert struct {
} }
// List of certified categories // List of certified categories
func (c Certificates) ListOfCertifiedCategories(params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) { func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
url := "/v1/product/certificate/types" url := "/v1/product/certificate/types"
resp := &ListOfCertifiedCategoriesResponse{} resp := &ListOfCertifiedCategoriesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -149,12 +150,12 @@ type LinkCertificateToProductResponse struct {
} }
// Link the certificate to the product // Link the certificate to the product
func (c Certificates) LinkToProduct(params *LinkCertificateToProductParams) (*LinkCertificateToProductResponse, error) { func (c Certificates) LinkToProduct(ctx context.Context, params *LinkCertificateToProductParams) (*LinkCertificateToProductResponse, error) {
url := "/v1/product/certificate/bind" url := "/v1/product/certificate/bind"
resp := &LinkCertificateToProductResponse{} resp := &LinkCertificateToProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -186,12 +187,12 @@ type DeleteCertificateResult struct {
} }
// Delete certificate // Delete certificate
func (c Certificates) Delete(params *DeleteCertificateParams) (*DeleteCertificateResponse, error) { func (c Certificates) Delete(ctx context.Context, params *DeleteCertificateParams) (*DeleteCertificateResponse, error) {
url := "/v1/product/certificate/delete" url := "/v1/product/certificate/delete"
resp := &DeleteCertificateResponse{} resp := &DeleteCertificateResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -248,12 +249,12 @@ type GetCertificateInfoResult struct {
} }
// Certificate information // Certificate information
func (c Certificates) GetInfo(params *GetCertificateInfoParams) (*GetCertificateInfoResponse, error) { func (c Certificates) GetInfo(ctx context.Context, params *GetCertificateInfoParams) (*GetCertificateInfoResponse, error) {
url := "/v1/product/certificate/info" url := "/v1/product/certificate/info"
resp := &GetCertificateInfoResponse{} resp := &GetCertificateInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -331,12 +332,12 @@ type ListCertificatesResultCert struct {
} }
// Certificates list // Certificates list
func (c Certificates) List(params *ListCertificatesParams) (*ListCertificatesResponse, error) { func (c Certificates) List(ctx context.Context, params *ListCertificatesParams) (*ListCertificatesResponse, error) {
url := "/v1/product/certificate/list" url := "/v1/product/certificate/list"
resp := &ListCertificatesResponse{} resp := &ListCertificatesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -360,12 +361,12 @@ type ProductStatusesResult struct {
Name string `json:"name"` Name string `json:"name"`
} }
func (c Certificates) ProductStatuses() (*ProductStatusesResponse, error) { func (c Certificates) ProductStatuses(ctx context.Context) (*ProductStatusesResponse, error) {
url := "/v1/product/certificate/list" url := "/v1/product/certificate/list"
resp := &ProductStatusesResponse{} resp := &ProductStatusesResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -410,12 +411,12 @@ type ListProductsForCertificateResult struct {
} }
// A method for getting a list of possible statuses of products when binding them to a certificate // A method for getting a list of possible statuses of products when binding them to a certificate
func (c Certificates) ListProductsForCertificate(params *ListProductsForCertificateParams) (*ListProductsForCertificateResponse, error) { func (c Certificates) ListProductsForCertificate(ctx context.Context, params *ListProductsForCertificateParams) (*ListProductsForCertificateResponse, error) {
url := "/v1/product/certificate/products/list" url := "/v1/product/certificate/products/list"
resp := &ListProductsForCertificateResponse{} resp := &ListProductsForCertificateResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -453,12 +454,12 @@ type UnlinkFromProductResult struct {
} }
// Unbind products from a certificate // Unbind products from a certificate
func (c Certificates) UnlinkFromProduct(params *UnlinkFromProductParams) (*UnlinkFromProductResponse, error) { func (c Certificates) UnlinkFromProduct(ctx context.Context, params *UnlinkFromProductParams) (*UnlinkFromProductResponse, error) {
url := "/v1/product/certificate/unbind" url := "/v1/product/certificate/unbind"
resp := &UnlinkFromProductResponse{} resp := &UnlinkFromProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -483,12 +484,12 @@ type PossibleRejectReasonsResult struct {
} }
// Possible certificate rejection reasons // Possible certificate rejection reasons
func (c Certificates) PossibleRejectReasons() (*PossibleRejectReasonsResponse, error) { func (c Certificates) PossibleRejectReasons(ctx context.Context) (*PossibleRejectReasonsResponse, error) {
url := "/v1/product/certificate/rejection_reasons/list" url := "/v1/product/certificate/rejection_reasons/list"
resp := &PossibleRejectReasonsResponse{} resp := &PossibleRejectReasonsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -512,12 +513,12 @@ type PossibleStatusesResult struct {
Name string `json:"name"` Name string `json:"name"`
} }
func (c Certificates) PossibleStatuses() (*PossibleStatusesResponse, error) { func (c Certificates) PossibleStatuses(ctx context.Context) (*PossibleStatusesResponse, error) {
url := "/v1/product/certificate/status/list" url := "/v1/product/certificate/status/list"
resp := &PossibleStatusesResponse{} resp := &PossibleStatusesResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -556,12 +557,12 @@ type AddCertificatesForProductsResponse struct {
} }
// Adding certificates for products // Adding certificates for products
func (c Certificates) AddForProducts(params *AddCertificatesForProductsParams) (*AddCertificatesForProductsResponse, error) { func (c Certificates) AddForProducts(ctx context.Context, params *AddCertificatesForProductsParams) (*AddCertificatesForProductsResponse, error) {
url := "/v1/product/certificate/create" url := "/v1/product/certificate/create"
resp := &AddCertificatesForProductsResponse{} resp := &AddCertificatesForProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, map[string]string{
"Content-Type": "multipart/form-data", "Content-Type": "multipart/form-data",
}) })
if err != nil { if err != nil {

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
"time" "time"
@@ -51,7 +52,8 @@ func TestListOfAccordanceTypes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().ListOfAccordanceTypes() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().ListOfAccordanceTypes(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -113,7 +115,8 @@ func TestDirectoryOfDocumentTypes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().DirectoryOfDocumentTypes() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().DirectoryOfDocumentTypes(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -168,7 +171,8 @@ func TestListOfCertifiedCategories(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().ListOfCertifiedCategories(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().ListOfCertifiedCategories(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -215,7 +219,8 @@ func TestLinkCertificateToProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().LinkToProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().LinkToProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -264,7 +269,8 @@ func TestDeleteCertificate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().Delete(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().Delete(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -322,7 +328,8 @@ func TestGetCertificateInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().GetInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().GetInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -395,7 +402,8 @@ func TestListCertificates(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().List(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().List(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -441,7 +449,8 @@ func TestProductStatuses(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().ProductStatuses() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().ProductStatuses(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -498,7 +507,8 @@ func TestListProductsForCertificate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().ListProductsForCertificate(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().ListProductsForCertificate(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -551,7 +561,8 @@ func TestUnlinkFromProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().UnlinkFromProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().UnlinkFromProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -597,7 +608,8 @@ func TestPossibleRejectReasons(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().PossibleRejectReasons() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().PossibleRejectReasons(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -643,7 +655,8 @@ func TestPossibleStatuses(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().PossibleStatuses() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().PossibleStatuses(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -695,7 +708,8 @@ func TestAddCertificatesForProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Certificates().AddForProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Certificates().AddForProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -61,7 +62,8 @@ func TestListChats(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().List(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().List(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -119,7 +121,8 @@ func TestSendMessage(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().SendMessage(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().SendMessage(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -167,7 +170,8 @@ func TestSendFile(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().SendFile(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().SendFile(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -230,7 +234,8 @@ func TestChatHistory(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().History(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().History(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -296,7 +301,8 @@ func TestUpdateChat(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().Update(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().Update(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -344,7 +350,8 @@ func TestCreateNewChat(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().Create(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().Create(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -397,7 +404,8 @@ func TestMarkAsRead(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Chats().MarkAsRead(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Chats().MarkAsRead(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

@@ -1,5 +1,11 @@
package ozon package ozon
import "time"
const (
testTimeout = 5 * time.Second
)
type Order string type Order string
const ( const (
@@ -37,13 +43,7 @@ const (
CancellationsMetric GetAnalyticsDataFilterMetric = "cancellations" CancellationsMetric GetAnalyticsDataFilterMetric = "cancellations"
OrderedUnits GetAnalyticsDataFilterMetric = "ordered_units" OrderedUnits GetAnalyticsDataFilterMetric = "ordered_units"
DeliveredUnits GetAnalyticsDataFilterMetric = "delivered_units" DeliveredUnits GetAnalyticsDataFilterMetric = "delivered_units"
AdvViewPDP GetAnalyticsDataFilterMetric = "adv_view_pdp"
AdvViewSearchCategory GetAnalyticsDataFilterMetric = "adv_view_search_category"
AdvViewAll GetAnalyticsDataFilterMetric = "adv_view_all"
AdvSumAll GetAnalyticsDataFilterMetric = "adv_sum_all"
PositionCategory GetAnalyticsDataFilterMetric = "position_category" PositionCategory GetAnalyticsDataFilterMetric = "position_category"
PostingsMetric GetAnalyticsDataFilterMetric = "postings"
PostingsPremium GetAnalyticsDataFilterMetric = "postings_premium"
) )
type WarehouseType string type WarehouseType string
@@ -505,3 +505,85 @@ const (
// don't change anything. Default value // don't change anything. Default value
PriceStrategyUnknown PriceStrategy = "UNKNOWN" PriceStrategyUnknown PriceStrategy = "UNKNOWN"
) )
type FBPFilter string
const (
// all shipments matching other filters will be returned in the response
FBPFilterAll FBPFilter = "all"
// only FBP shipments will be returned
FBPFilterOnly FBPFilter = "only"
// all shipments except FBP will be returned
FBPFilterWithout FBPFilter = "without"
)
type InvoiceCurrency string
const (
// dollar
InvoiceCurrencyUSD InvoiceCurrency = "USD"
// euro
InvoiceCurrencyEUR InvoiceCurrency = "EUR"
// Turkish lira
InvoiceCurrencyTRY InvoiceCurrency = "TRY"
// yuan
InvoiceCurrencyCNY InvoiceCurrency = "CNY"
// ruble
InvoiceCurrencyRUB InvoiceCurrency = "RUB"
// pound sterling
InvoiceCurrencyGBP InvoiceCurrency = "GBP"
)
type ReportType string
const (
// products report
ReportTypeSellerProducts ReportType = "SELLER_PRODUCTS"
// transactions report
ReportTypeSellerTransactions ReportType = "SELLER_TRANSACTIONS"
// product prices report
ReportTypeSellerProductPrices ReportType = "SELLER_PRODUCT_PRICES"
// stocks report
ReportTypeSellerStock ReportType = "SELLER_STOCK"
// products movement report
ReportTypeSellerProductMovement ReportType = "SELLER_PRODUCT_MOVEMENT"
// returns report
ReportTypeSellerReturns ReportType = "SELLER_RETURNS"
// shipments report
ReportTypeSellerPostings ReportType = "SELLER_POSTINGS"
// financial report
ReportTypeSellerFinance ReportType = "SELLER_FINANCE"
)
type ReportInfoStatus string
const (
ReportInfoWaiting ReportInfoStatus = "waiting"
ReportInfoProcessing ReportInfoStatus = "processing"
ReportInfoSuccess ReportInfoStatus = "success"
ReportInfoFailed ReportInfoStatus = "failed"
)
type SKUAvailability string
const (
SKUAvailabilityHidden = "HIDDEN"
SKUAvailabilityAvailable = "AVAILABLE"
// SKU is deleted
SKUAvailabilityUnavailable = "UNAVAILABLE"
)

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -165,12 +166,12 @@ type FBOFinancialData struct {
} }
// Returns a list of shipments for a specified period of time. You can additionally filter the shipments by their status // Returns a list of shipments for a specified period of time. You can additionally filter the shipments by their status
func (c FBO) GetShipmentsList(params *GetFBOShipmentsListParams) (*GetFBOShipmentsListResponse, error) { func (c FBO) GetShipmentsList(ctx context.Context, params *GetFBOShipmentsListParams) (*GetFBOShipmentsListResponse, error) {
url := "/v2/posting/fbo/list" url := "/v2/posting/fbo/list"
resp := &GetFBOShipmentsListResponse{} resp := &GetFBOShipmentsListResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -274,12 +275,12 @@ type GetShipmentDetailsResultAnalyticsData struct {
} }
// Returns information about the shipment by its identifier // Returns information about the shipment by its identifier
func (c FBO) GetShipmentDetails(params *GetShipmentDetailsParams) (*GetShipmentDetailsResponse, error) { func (c FBO) GetShipmentDetails(ctx context.Context, params *GetShipmentDetailsParams) (*GetShipmentDetailsResponse, error) {
url := "/v2/posting/fbo/get" url := "/v2/posting/fbo/get"
resp := &GetShipmentDetailsResponse{} resp := &GetShipmentDetailsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -374,12 +375,12 @@ type SupplyRequestCommonResponseSupplyWarehouse struct {
// Method for getting a list of supply requests to the Ozon warehouse. // Method for getting a list of supply requests to the Ozon warehouse.
// Requests with supply both to a specific warehouse and via a virtual // Requests with supply both to a specific warehouse and via a virtual
// distribution center (vDC) are taken into account // distribution center (vDC) are taken into account
func (c FBO) ListSupplyRequests(params *ListSupplyRequestsParams) (*ListSupplyRequestsResponse, error) { func (c FBO) ListSupplyRequests(ctx context.Context, params *ListSupplyRequestsParams) (*ListSupplyRequestsResponse, error) {
url := "/v1/supply-order/list" url := "/v1/supply-order/list"
resp := &ListSupplyRequestsResponse{} resp := &ListSupplyRequestsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -419,12 +420,12 @@ type GetSupplyRequestInfoVehicle struct {
// Method for getting detailed information on a supply request. // Method for getting detailed information on a supply request.
// Requests with supply both to a specific warehouse and via a // Requests with supply both to a specific warehouse and via a
// virtual distribution center (vDC) are taken into account // virtual distribution center (vDC) are taken into account
func (c FBO) GetSupplyRequestInfo(params *GetSupplyRequestInfoParams) (*GetSupplyRequestInfoResponse, error) { func (c FBO) GetSupplyRequestInfo(ctx context.Context, params *GetSupplyRequestInfoParams) (*GetSupplyRequestInfoResponse, error) {
url := "/v1/supply-order/get" url := "/v1/supply-order/get"
resp := &GetSupplyRequestInfoResponse{} resp := &GetSupplyRequestInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -477,12 +478,12 @@ type ListProductsInSupplyRequestItem struct {
} }
// List of products in the sullpy request // List of products in the sullpy request
func (c FBO) ListProductsInSupplyRequest(params *ListProductsInSupplyRequestParams) (*ListProductsInSupplyRequestResponse, error) { func (c FBO) ListProductsInSupplyRequest(ctx context.Context, params *ListProductsInSupplyRequestParams) (*ListProductsInSupplyRequestResponse, error) {
url := "/v1/supply-order/items" url := "/v1/supply-order/items"
resp := &ListProductsInSupplyRequestResponse{} resp := &ListProductsInSupplyRequestResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -534,12 +535,12 @@ type GetWarehouseWorkloadResultWarehouse struct {
} }
// Method returns a list of active Ozon warehouses with information about their average workload in the nearest future // Method returns a list of active Ozon warehouses with information about their average workload in the nearest future
func (c FBO) GetWarehouseWorkload() (*GetWarehouseWorkloadResponse, error) { func (c FBO) GetWarehouseWorkload(ctx context.Context) (*GetWarehouseWorkloadResponse, error) {
url := "/v1/supplier/available_warehouses" url := "/v1/supplier/available_warehouses"
resp := &GetWarehouseWorkloadResponse{} resp := &GetWarehouseWorkloadResponse{}
response, err := c.client.Request(http.MethodGet, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -133,7 +134,8 @@ func TestGetFBOShipmentsList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().GetShipmentsList(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().GetShipmentsList(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -261,7 +263,8 @@ func TestGetShipmentDetails(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().GetShipmentDetails(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().GetShipmentDetails(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -339,7 +342,8 @@ func TestListSupplyRequests(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().ListSupplyRequests(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().ListSupplyRequests(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -414,7 +418,8 @@ func TestGetSupplyRequestInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().GetSupplyRequestInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().GetSupplyRequestInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -472,7 +477,8 @@ func TestListProductsInSupplyRequest(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().ListProductsInSupplyRequest(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().ListProductsInSupplyRequest(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -530,7 +536,8 @@ func TestGetWarehouseWorkload(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBO().GetWarehouseWorkload() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBO().GetWarehouseWorkload(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -52,6 +53,13 @@ type ListUnprocessedShipmentsFilter struct {
// Delivery method identifier // Delivery method identifier
DeliveryMethodId []int64 `json:"delivery_method_id"` DeliveryMethodId []int64 `json:"delivery_method_id"`
// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
//
// Default value is all.
//
// The FBP scheme is available only for sellers from China
FBPFilter FBPFilter `json:"fbpFilter"`
// Delivery service identifier // Delivery service identifier
ProviderId []int64 `json:"provider_id"` ProviderId []int64 `json:"provider_id"`
@@ -298,7 +306,7 @@ type FBSRequirements struct {
// //
// To pack the shipment, pass the CCD number for all listed SKUs. // To pack the shipment, pass the CCD number for all listed SKUs.
// If you do not have a CCD number, pass the value `is_gtd_absent` = true // If you do not have a CCD number, pass the value `is_gtd_absent` = true
// via the `/v3/posting/fbs/ship/package` or `/v3/posting/fbs/ship` method // via the `/v3/posting/fbs/ship/package`
ProductsRequiringGTD []string `json:"products_requiring_gtd"` ProductsRequiringGTD []string `json:"products_requiring_gtd"`
// Array of Ozon Product IDs (SKU) for which // Array of Ozon Product IDs (SKU) for which
@@ -487,12 +495,12 @@ type FinancialDataProductPicking struct {
Tag string `json:"tag"` Tag string `json:"tag"`
} }
func (c FBS) ListUnprocessedShipments(params *ListUnprocessedShipmentsParams) (*ListUnprocessedShipmentsResponse, error) { func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocessedShipmentsParams) (*ListUnprocessedShipmentsResponse, error) {
url := "/v3/posting/fbs/unfulfilled/list" url := "/v3/posting/fbs/unfulfilled/list"
resp := &ListUnprocessedShipmentsResponse{} resp := &ListUnprocessedShipmentsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -524,6 +532,13 @@ type GetFBSShipmentsListFilter struct {
// Delivery method identifier // Delivery method identifier
DeliveryMethodId []int64 `json:"delivery_method_id"` DeliveryMethodId []int64 `json:"delivery_method_id"`
// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
//
// Default value is all.
//
// The FBP scheme is available only for sellers from China
FBPFilter FBPFilter `json:"fbpFilter"`
// Order identifier // Order identifier
OrderId int64 `json:"order_id"` OrderId int64 `json:"order_id"`
@@ -588,12 +603,12 @@ type GetFBSShipmentsListResult struct {
// You can filter shipments by their status. The list of available statuses is specified in the description of the filter.status parameter. // You can filter shipments by their status. The list of available statuses is specified in the description of the filter.status parameter.
// //
// The true value of the has_next parameter in the response means there is not the entire array of shipments in the response. To get information on the remaining shipments, make a new request with a different offset value. // The true value of the has_next parameter in the response means there is not the entire array of shipments in the response. To get information on the remaining shipments, make a new request with a different offset value.
func (c FBS) GetFBSShipmentsList(params *GetFBSShipmentsListParams) (*GetFBSShipmentsListResponse, error) { func (c FBS) GetFBSShipmentsList(ctx context.Context, params *GetFBSShipmentsListParams) (*GetFBSShipmentsListResponse, error) {
url := "/v3/posting/fbs/list" url := "/v3/posting/fbs/list"
resp := &GetFBSShipmentsListResponse{} resp := &GetFBSShipmentsListResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -659,12 +674,12 @@ type PackOrderAdditionalData struct {
// Differs from /v2/posting/fbs/ship by the presence of the field `exemplar_info` in the request. // Differs from /v2/posting/fbs/ship by the presence of the field `exemplar_info` in the request.
// //
// If necessary, specify the number of the cargo customs declaration in the gtd parameter. If it is missing, pass the value is_gtd_absent = true // If necessary, specify the number of the cargo customs declaration in the gtd parameter. If it is missing, pass the value is_gtd_absent = true
func (c FBS) PackOrder(params *PackOrderParams) (*PackOrderResponse, error) { func (c FBS) PackOrder(ctx context.Context, params *PackOrderParams) (*PackOrderResponse, error) {
url := "/v4/posting/fbs/ship" url := "/v4/posting/fbs/ship"
resp := &PackOrderResponse{} resp := &PackOrderResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -729,12 +744,12 @@ type ValidateLabelingCodesResultProduct struct {
// Method for checking whether labeling codes meet the "Chestny ZNAK" system requirements on length and symbols. // Method for checking whether labeling codes meet the "Chestny ZNAK" system requirements on length and symbols.
// //
// If you don't have the customs cargo declaration (CCD) number, you don't have to specify it // If you don't have the customs cargo declaration (CCD) number, you don't have to specify it
func (c FBS) ValidateLabelingCodes(params *ValidateLabelingCodesParams) (*ValidateLabelingCodesResponse, error) { func (c FBS) ValidateLabelingCodes(ctx context.Context, params *ValidateLabelingCodesParams) (*ValidateLabelingCodesResponse, error) {
url := "/v4/fbs/posting/product/exemplar/validate" url := "/v4/fbs/posting/product/exemplar/validate"
resp := &ValidateLabelingCodesResponse{} resp := &ValidateLabelingCodesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -831,12 +846,12 @@ type GetShipmentDataByBarcodeResultFinancialData struct {
} }
// Method for getting shipments data by barcode // Method for getting shipments data by barcode
func (c FBS) GetShipmentDataByBarcode(params *GetShipmentDataByBarcodeParams) (*GetShipmentDataByBarcodeResponse, error) { func (c FBS) GetShipmentDataByBarcode(ctx context.Context, params *GetShipmentDataByBarcodeParams) (*GetShipmentDataByBarcodeResponse, error) {
url := "/v2/posting/fbs/get-by-barcode" url := "/v2/posting/fbs/get-by-barcode"
resp := &GetShipmentDataByBarcodeResponse{} resp := &GetShipmentDataByBarcodeResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1120,12 +1135,12 @@ type FBSProductExemplar struct {
} }
// Method for getting shipment details by identifier // Method for getting shipment details by identifier
func (c FBS) GetShipmentDataByIdentifier(params *GetShipmentDataByIdentifierParams) (*GetShipmentDataByIdentifierResponse, error) { func (c FBS) GetShipmentDataByIdentifier(ctx context.Context, params *GetShipmentDataByIdentifierParams) (*GetShipmentDataByIdentifierResponse, error) {
url := "/v3/posting/fbs/get" url := "/v3/posting/fbs/get"
resp := &GetShipmentDataByIdentifierResponse{} resp := &GetShipmentDataByIdentifierResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1166,12 +1181,12 @@ type AddTrackingNumbersResponseResult struct {
} }
// Add tracking numbers to shipments // Add tracking numbers to shipments
func (c FBS) AddTrackingNumbers(params *AddTrackingNumbersParams) (*AddTrackingNumbersResponse, error) { func (c FBS) AddTrackingNumbers(ctx context.Context, params *AddTrackingNumbersParams) (*AddTrackingNumbersResponse, error) {
url := "/v2/fbs/posting/tracking-number/set" url := "/v2/fbs/posting/tracking-number/set"
resp := &AddTrackingNumbersResponse{} resp := &AddTrackingNumbersResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1290,12 +1305,12 @@ type FBSAct struct {
} }
// Returns a list of shipment certificates allowing to filter them by time period, status, and integration type // Returns a list of shipment certificates allowing to filter them by time period, status, and integration type
func (c FBS) ListOfShipmentCertificates(params *ListOfShipmentCertificatesParams) (*ListOfShipmentCertificatesResponse, error) { func (c FBS) ListOfShipmentCertificates(ctx context.Context, params *ListOfShipmentCertificatesParams) (*ListOfShipmentCertificatesResponse, error) {
url := "/v2/posting/fbs/act/list" url := "/v2/posting/fbs/act/list"
resp := &ListOfShipmentCertificatesResponse{} resp := &ListOfShipmentCertificatesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1322,12 +1337,12 @@ type SignShipmentCertificateResponse struct {
} }
// Signs shipment certificates electronically via the electronic documents (ED) system of Ozon logistics // Signs shipment certificates electronically via the electronic documents (ED) system of Ozon logistics
func (c FBS) SignShipmentCertificate(params *SignShipmentCertificateParams) (*SignShipmentCertificateResponse, error) { func (c FBS) SignShipmentCertificate(ctx context.Context, params *SignShipmentCertificateParams) (*SignShipmentCertificateResponse, error) {
url := "/v2/posting/fbs/digital/act/document-sign" url := "/v2/posting/fbs/digital/act/document-sign"
resp := &SignShipmentCertificateResponse{} resp := &SignShipmentCertificateResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1360,12 +1375,12 @@ type ChangeStatusToResponseResult struct {
} }
// Changes the shipment status to "Delivering" if a third-party delivery service is being used // Changes the shipment status to "Delivering" if a third-party delivery service is being used
func (c FBS) ChangeStatusToDelivering(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) { func (c FBS) ChangeStatusToDelivering(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
url := "/v2/fbs/posting/delivering" url := "/v2/fbs/posting/delivering"
resp := &ChangeStatusToResponse{} resp := &ChangeStatusToResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1375,12 +1390,12 @@ func (c FBS) ChangeStatusToDelivering(params *ChangeStatusToParams) (*ChangeStat
} }
// Changes the shipment status to "Last mile" if a third-party delivery service is being used // Changes the shipment status to "Last mile" if a third-party delivery service is being used
func (c FBS) ChangeStatusToLastMile(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) { func (c FBS) ChangeStatusToLastMile(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
url := "/v2/fbs/posting/last-mile" url := "/v2/fbs/posting/last-mile"
resp := &ChangeStatusToResponse{} resp := &ChangeStatusToResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1390,12 +1405,12 @@ func (c FBS) ChangeStatusToLastMile(params *ChangeStatusToParams) (*ChangeStatus
} }
// Changes the shipment status to "Delivered" if a third-party delivery service is being used // Changes the shipment status to "Delivered" if a third-party delivery service is being used
func (c FBS) ChangeStatusToDelivered(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) { func (c FBS) ChangeStatusToDelivered(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
url := "/v2/fbs/posting/delivered" url := "/v2/fbs/posting/delivered"
resp := &ChangeStatusToResponse{} resp := &ChangeStatusToResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1405,12 +1420,12 @@ func (c FBS) ChangeStatusToDelivered(params *ChangeStatusToParams) (*ChangeStatu
} }
// Change shipment status to "Sent by seller". Status is only available to sellers with a first mile selling from abroad // Change shipment status to "Sent by seller". Status is only available to sellers with a first mile selling from abroad
func (c FBS) ChangeStatusToSendBySeller(params *ChangeStatusToParams) (*ChangeStatusToResponse, error) { func (c FBS) ChangeStatusToSendBySeller(ctx context.Context, params *ChangeStatusToParams) (*ChangeStatusToResponse, error) {
url := "/v2/fbs/posting/sent-by-seller" url := "/v2/fbs/posting/sent-by-seller"
resp := &ChangeStatusToResponse{} resp := &ChangeStatusToResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1432,12 +1447,12 @@ type PassShipmentToShippingResponse struct {
} }
// Transfers disputed orders to shipping. The shipment status will change to `awaiting_deliver` // Transfers disputed orders to shipping. The shipment status will change to `awaiting_deliver`
func (c FBS) PassShipmentToShipping(params *PassShipmentToShippingParams) (*PassShipmentToShippingResponse, error) { func (c FBS) PassShipmentToShipping(ctx context.Context, params *PassShipmentToShippingParams) (*PassShipmentToShippingResponse, error) {
url := "/v2/posting/fbs/awaiting-delivery" url := "/v2/posting/fbs/awaiting-delivery"
resp := &PassShipmentToShippingResponse{} resp := &PassShipmentToShippingResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1480,12 +1495,12 @@ type CancelShipmentResponse struct {
// You can't cancel presumably delivered orders. // You can't cancel presumably delivered orders.
// //
// If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field. // If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field.
func (c FBS) CancelShipment(params *CancelShipmentParams) (*CancelShipmentResponse, error) { func (c FBS) CancelShipment(ctx context.Context, params *CancelShipmentParams) (*CancelShipmentResponse, error) {
url := "/v2/posting/fbs/cancel" url := "/v2/posting/fbs/cancel"
resp := &CancelShipmentResponse{} resp := &CancelShipmentResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1527,12 +1542,12 @@ type CreateActResult struct {
// Launches the procedure for generating the transfer documents: acceptance and transfer certificate and the waybill. // Launches the procedure for generating the transfer documents: acceptance and transfer certificate and the waybill.
// //
// To generate and receive transfer documents, transfer the shipment to the `awaiting_deliver` status // To generate and receive transfer documents, transfer the shipment to the `awaiting_deliver` status
func (c FBS) CreateAct(params *CreateActParams) (*CreateActResponse, error) { func (c FBS) CreateAct(ctx context.Context, params *CreateActParams) (*CreateActResponse, error) {
url := "/v2/posting/fbs/act/create" url := "/v2/posting/fbs/act/create"
resp := &CreateActResponse{} resp := &CreateActResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1569,12 +1584,12 @@ type GetLabelingResult struct {
} }
// Method for getting labeling after using the /v1/posting/fbs/package-label/create method // Method for getting labeling after using the /v1/posting/fbs/package-label/create method
func (c FBS) GetLabeling(params *GetLabelingParams) (*GetLabelingResponse, error) { func (c FBS) GetLabeling(ctx context.Context, params *GetLabelingParams) (*GetLabelingResponse, error) {
url := "/v1/posting/fbs/package-label/get" url := "/v1/posting/fbs/package-label/get"
resp := &GetLabelingResponse{} resp := &GetLabelingResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/pdf", "Content-Type": "application/pdf",
}) })
if err != nil { if err != nil {
@@ -1609,12 +1624,12 @@ type PrintLabelingResponse struct {
// We recommend requesting the label 45-60 seconds after the shipments were packed. // We recommend requesting the label 45-60 seconds after the shipments were packed.
// //
// The next postings are not ready error means that the label is not ready. Try again later // The next postings are not ready error means that the label is not ready. Try again later
func (c FBS) PrintLabeling(params *PrintLabelingParams) (*PrintLabelingResponse, error) { func (c FBS) PrintLabeling(ctx context.Context, params *PrintLabelingParams) (*PrintLabelingResponse, error) {
url := "/v2/posting/fbs/package-label" url := "/v2/posting/fbs/package-label"
resp := &PrintLabelingResponse{} resp := &PrintLabelingResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/pdf", "Content-Type": "application/pdf",
}) })
if err != nil { if err != nil {
@@ -1645,12 +1660,12 @@ type CreateTaskForGeneratingLabelResult struct {
// Method for creating a task for asynchronous labeling generation. // Method for creating a task for asynchronous labeling generation.
// //
// To get labels created as a result of the method, use the /v1/posting/fbs/package-label/get method // To get labels created as a result of the method, use the /v1/posting/fbs/package-label/get method
func (c FBS) CreateTaskForGeneratingLabel(params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) { func (c FBS) CreateTaskForGeneratingLabel(ctx context.Context, params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
url := "/v1/posting/fbs/package-label/create" url := "/v1/posting/fbs/package-label/create"
resp := &CreateTaskForGeneratingLabelResponse{} resp := &CreateTaskForGeneratingLabelResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/pdf", "Content-Type": "application/pdf",
}) })
if err != nil { if err != nil {
@@ -1701,12 +1716,12 @@ type GetDropOffPointRestrictionsResult struct {
// Method for getting dimensions, weight, and other restrictions of the drop-off point by the shipment number. // Method for getting dimensions, weight, and other restrictions of the drop-off point by the shipment number.
// The method is applicable only for the FBS scheme // The method is applicable only for the FBS scheme
func (c FBS) GetDropOffPointRestrictions(params *GetDropOffPointRestrictionsParams) (*GetDropOffPointRestrictionsResponse, error) { func (c FBS) GetDropOffPointRestrictions(ctx context.Context, params *GetDropOffPointRestrictionsParams) (*GetDropOffPointRestrictionsResponse, error) {
url := "/v1/posting/fbs/restrictions" url := "/v1/posting/fbs/restrictions"
resp := &GetDropOffPointRestrictionsResponse{} resp := &GetDropOffPointRestrictionsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1752,12 +1767,12 @@ type CheckProductItemsDataResponse struct {
// For example, you have 10 product items in your system. // For example, you have 10 product items in your system.
// You have passed them for checking and saving. Then they added another 60 product items to your system. // You have passed them for checking and saving. Then they added another 60 product items to your system.
// When you pass product items for checking and saving again, pass all of them: both old and newly added // When you pass product items for checking and saving again, pass all of them: both old and newly added
func (c FBS) CheckproductItemsData(params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) { func (c FBS) CheckproductItemsData(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
url := "/v4/fbs/posting/product/exemplar/set" url := "/v4/fbs/posting/product/exemplar/set"
resp := &CheckProductItemsDataResponse{} resp := &CheckProductItemsDataResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1789,12 +1804,12 @@ type GetProductItemsCheckStatusesResponse struct {
// Method for getting check statuses of product items that were passed in the `/fbs/posting/product/exemplar/set` method. // Method for getting check statuses of product items that were passed in the `/fbs/posting/product/exemplar/set` method.
// Also returns data on these product items. // Also returns data on these product items.
func (c FBS) GetProductItemsCheckStatuses(params *GetProductItemsCheckStatusesParams) (*GetProductItemsCheckStatusesResponse, error) { func (c FBS) GetProductItemsCheckStatuses(ctx context.Context, params *GetProductItemsCheckStatusesParams) (*GetProductItemsCheckStatusesResponse, error) {
url := "/v4/fbs/posting/product/exemplar/status" url := "/v4/fbs/posting/product/exemplar/status"
resp := &GetProductItemsCheckStatusesResponse{} resp := &GetProductItemsCheckStatusesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1827,12 +1842,12 @@ type RescheduleShipmentDeliveryDateResponse struct {
} }
// You can change the delivery date of a shipment up to two times // You can change the delivery date of a shipment up to two times
func (c FBS) RescheduleShipmentDeliveryDate(params *RescheduleShipmentDeliveryDateParams) (*RescheduleShipmentDeliveryDateResponse, error) { func (c FBS) RescheduleShipmentDeliveryDate(ctx context.Context, params *RescheduleShipmentDeliveryDateParams) (*RescheduleShipmentDeliveryDateResponse, error) {
url := "/v1/posting/fbs/timeslot/set" url := "/v1/posting/fbs/timeslot/set"
resp := &RescheduleShipmentDeliveryDateResponse{} resp := &RescheduleShipmentDeliveryDateResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1868,12 +1883,12 @@ type DateAvailableForDeliveryScheduleDeliveryInterval struct {
} }
// Method for getting the dates and number of times available for delivery reschedule // Method for getting the dates and number of times available for delivery reschedule
func (c FBS) DateAvailableForDeliverySchedule(params *DateAvailableForDeliveryScheduleParams) (*DateAvailableForDeliveryScheduleResponse, error) { func (c FBS) DateAvailableForDeliverySchedule(ctx context.Context, params *DateAvailableForDeliveryScheduleParams) (*DateAvailableForDeliveryScheduleResponse, error) {
url := "/v1/posting/fbs/timeslot/change-restrictions" url := "/v1/posting/fbs/timeslot/change-restrictions"
resp := &DateAvailableForDeliveryScheduleResponse{} resp := &DateAvailableForDeliveryScheduleResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1903,12 +1918,12 @@ type ListManufacturingCountriesResult struct {
} }
// Method for getting a list of available manufacturing countries and their ISO codes // Method for getting a list of available manufacturing countries and their ISO codes
func (c FBS) ListManufacturingCountries(params *ListManufacturingCountriesParams) (*ListManufacturingCountriesResponse, error) { func (c FBS) ListManufacturingCountries(ctx context.Context, params *ListManufacturingCountriesParams) (*ListManufacturingCountriesResponse, error) {
url := "/v2/posting/fbs/product/country/list" url := "/v2/posting/fbs/product/country/list"
resp := &ListManufacturingCountriesResponse{} resp := &ListManufacturingCountriesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1939,12 +1954,12 @@ type SetManufacturingCountryResponse struct {
} }
// The method to set the manufacturing country to the product if it hasn't been specified // The method to set the manufacturing country to the product if it hasn't been specified
func (c FBS) SetManufacturingCountry(params *SetManufacturingCountryParams) (*SetManufacturingCountryResponse, error) { func (c FBS) SetManufacturingCountry(ctx context.Context, params *SetManufacturingCountryParams) (*SetManufacturingCountryResponse, error) {
url := "/v2/posting/fbs/product/country/set" url := "/v2/posting/fbs/product/country/set"
resp := &SetManufacturingCountryResponse{} resp := &SetManufacturingCountryResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1994,12 +2009,12 @@ type PartialPackOrderAdditionalData struct {
// The primary unassembled shipment will contain some of the products that were not passed to the request. // The primary unassembled shipment will contain some of the products that were not passed to the request.
// //
// The status of the original shipment will only change when the split shipments status changes // The status of the original shipment will only change when the split shipments status changes
func (c FBS) PartialPackOrder(params *PartialPackOrderParams) (*PartialPackOrderResponse, error) { func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
url := "/v3/posting/fbs/ship/package" url := "/v3/posting/fbs/ship/package"
resp := &PartialPackOrderResponse{} resp := &PartialPackOrderResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2087,12 +2102,12 @@ type AvailableFreightsListResultError struct {
} }
// Method for getting freights that require printing acceptance and transfer certificates and a waybill // Method for getting freights that require printing acceptance and transfer certificates and a waybill
func (c FBS) AvailableFreightsList(params *AvailableFreightsListParams) (*AvailableFreightsListResponse, error) { func (c FBS) AvailableFreightsList(ctx context.Context, params *AvailableFreightsListParams) (*AvailableFreightsListResponse, error) {
url := "/v1/posting/carriage-available/list" url := "/v1/posting/carriage-available/list"
resp := &AvailableFreightsListResponse{} resp := &AvailableFreightsListResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2123,12 +2138,12 @@ type GenerateActResponse struct {
} }
// Get current status of generating digital acceptance and transfer certificate and waybill // Get current status of generating digital acceptance and transfer certificate and waybill
func (c FBS) GenerateAct(params *GenerateActParams) (*GenerateActResponse, error) { func (c FBS) GenerateAct(ctx context.Context, params *GenerateActParams) (*GenerateActResponse, error) {
url := "/v2/posting/fbs/digital/act/check-status" url := "/v2/posting/fbs/digital/act/check-status"
resp := &GenerateActResponse{} resp := &GenerateActResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2162,12 +2177,12 @@ type GetDigitalActResponse struct {
} }
// Specify the type of a certificate in the doc_type parameter: `act_of_acceptance`, `act_of_mismatch`, `act_of_excess` // Specify the type of a certificate in the doc_type parameter: `act_of_acceptance`, `act_of_mismatch`, `act_of_excess`
func (c FBS) GetDigitalAct(params *GetDigitalActParams) (*GetDigitalActResponse, error) { func (c FBS) GetDigitalAct(ctx context.Context, params *GetDigitalActParams) (*GetDigitalActResponse, error) {
url := "/v2/posting/fbs/digital/act/get-pdf" url := "/v2/posting/fbs/digital/act/get-pdf"
resp := &GetDigitalActResponse{} resp := &GetDigitalActResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/json", "Content-Type": "application/json",
}) })
if err != nil { if err != nil {
@@ -2197,12 +2212,12 @@ type PackageUnitLabelsResponse struct {
} }
// Method creates package unit labels // Method creates package unit labels
func (c FBS) PackageUnitLabel(params *PackageUnitLabelsParams) (*PackageUnitLabelsResponse, error) { func (c FBS) PackageUnitLabel(ctx context.Context, params *PackageUnitLabelsParams) (*PackageUnitLabelsResponse, error) {
url := "/v2/posting/fbs/act/get-container-labels" url := "/v2/posting/fbs/act/get-container-labels"
resp := &PackageUnitLabelsResponse{} resp := &PackageUnitLabelsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/json", "Content-Type": "application/json",
}) })
if err != nil { if err != nil {
@@ -2227,12 +2242,12 @@ type OpenDisputeOverShipmentResponse struct {
// If the shipment has been handed over for delivery, but has not been scanned at the sorting center, you can open a dispute. // If the shipment has been handed over for delivery, but has not been scanned at the sorting center, you can open a dispute.
// Opened dispute will put the shipment into the `arbitration` status // Opened dispute will put the shipment into the `arbitration` status
func (c FBS) OpenDisputeOverShipment(params *OpenDisputeOverShipmentParams) (*OpenDisputeOverShipmentResponse, error) { func (c FBS) OpenDisputeOverShipment(ctx context.Context, params *OpenDisputeOverShipmentParams) (*OpenDisputeOverShipmentResponse, error) {
url := "/v2/posting/fbs/arbitration" url := "/v2/posting/fbs/arbitration"
resp := &OpenDisputeOverShipmentResponse{} resp := &OpenDisputeOverShipmentResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2273,12 +2288,12 @@ type ShipmentCancellationReasonsResultReason struct {
} }
// Returns a list of cancellation reasons for particular shipments // Returns a list of cancellation reasons for particular shipments
func (c FBS) ShipmentCancellationReasons(params *ShipmentCancellationReasonsParams) (*ShipmentCancellationReasonsResponse, error) { func (c FBS) ShipmentCancellationReasons(ctx context.Context, params *ShipmentCancellationReasonsParams) (*ShipmentCancellationReasonsResponse, error) {
url := "/v1/posting/fbs/cancel-reason" url := "/v1/posting/fbs/cancel-reason"
resp := &ShipmentCancellationReasonsResponse{} resp := &ShipmentCancellationReasonsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2311,12 +2326,12 @@ type ShipmentsCancellatinoReasonsResult struct {
} }
// Returns a list of cancellation reasons for particular shipments // Returns a list of cancellation reasons for particular shipments
func (c FBS) ShipmentsCancellationReasons() (*ShipmentsCancellationReasonsResponse, error) { func (c FBS) ShipmentsCancellationReasons(ctx context.Context) (*ShipmentsCancellationReasonsResponse, error) {
url := "/v2/posting/fbs/cancel-reason/list" url := "/v2/posting/fbs/cancel-reason/list"
resp := &ShipmentsCancellationReasonsResponse{} resp := &ShipmentsCancellationReasonsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2349,12 +2364,12 @@ type AddWeightForBulkProductResponse struct {
} }
// Add weight for bulk products in a shipment // Add weight for bulk products in a shipment
func (c FBS) AddWeightForBulkProduct(params *AddWeightForBulkProductParams) (*AddWeightForBulkProductResponse, error) { func (c FBS) AddWeightForBulkProduct(ctx context.Context, params *AddWeightForBulkProductParams) (*AddWeightForBulkProductResponse, error) {
url := "/v2/posting/fbs/product/change" url := "/v2/posting/fbs/product/change"
resp := &AddWeightForBulkProductResponse{} resp := &AddWeightForBulkProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2408,12 +2423,12 @@ type CancelSendingResponse struct {
// You can't cancel presumably delivered orders. // You can't cancel presumably delivered orders.
// //
// If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field. // If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field.
func (c FBS) CancelSending(params *CancelSendingParams) (*CancelSendingResponse, error) { func (c FBS) CancelSending(ctx context.Context, params *CancelSendingParams) (*CancelSendingResponse, error) {
url := "/v2/posting/fbs/product/cancel" url := "/v2/posting/fbs/product/cancel"
resp := &CancelSendingResponse{} resp := &CancelSendingResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2478,12 +2493,12 @@ type ListShipmentInCertificateResultProduct struct {
} }
// Returns a list of shipments in the certificate by certificate identifier // Returns a list of shipments in the certificate by certificate identifier
func (c FBS) ListShipmentInCertificate(params *ListShipmentInCertificateParams) (*ListShipmentInCertificateResponse, error) { func (c FBS) ListShipmentInCertificate(ctx context.Context, params *ListShipmentInCertificateParams) (*ListShipmentInCertificateResponse, error) {
url := "/v2/posting/fbs/act/get-postings" url := "/v2/posting/fbs/act/get-postings"
resp := &ListShipmentInCertificateResponse{} resp := &ListShipmentInCertificateResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2515,12 +2530,12 @@ type SpecifyNumberOfBoxesResult struct {
} }
// Method for passing the number of boxes for multi-box shipments when working under the rFBS Aggregator scheme (using the Ozon partner delivery) // Method for passing the number of boxes for multi-box shipments when working under the rFBS Aggregator scheme (using the Ozon partner delivery)
func (c FBS) SpecifyNumberOfBoxes(params *SpecifyNumberOfBoxesParams) (*SpecifyNumberOfBoxesResponse, error) { func (c FBS) SpecifyNumberOfBoxes(ctx context.Context, params *SpecifyNumberOfBoxesParams) (*SpecifyNumberOfBoxesResponse, error) {
url := "/v3/posting/multiboxqty/set" url := "/v3/posting/multiboxqty/set"
resp := &SpecifyNumberOfBoxesResponse{} resp := &SpecifyNumberOfBoxesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2586,12 +2601,12 @@ type StatusOfActResponseResult struct {
// the method returns status of generating an acceptance and transfer certificate and a waybill. // the method returns status of generating an acceptance and transfer certificate and a waybill.
// //
// If you are connected to EDC, the method returns status of generating a waybill only // If you are connected to EDC, the method returns status of generating a waybill only
func (c FBS) StatusOfAct(params *StatusOfActParams) (*StatusOfActResponse, error) { func (c FBS) StatusOfAct(ctx context.Context, params *StatusOfActParams) (*StatusOfActResponse, error) {
url := "/v2/posting/fbs/act/check-status" url := "/v2/posting/fbs/act/check-status"
resp := &StatusOfActResponse{} resp := &StatusOfActResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2642,12 +2657,12 @@ type ETGBCustomDeclarationsResultETGB struct {
} }
// Method for getting Elektronik Ticaret Gümrük Beyannamesi (ETGB) customs declarations for sellers from Turkey // Method for getting Elektronik Ticaret Gümrük Beyannamesi (ETGB) customs declarations for sellers from Turkey
func (c FBS) ETGBCustomsDeclarations(params *ETGBCustomsDeclarationsParams) (*ETGBCustomsDeclarationsResponse, error) { func (c FBS) ETGBCustomsDeclarations(ctx context.Context, params *ETGBCustomsDeclarationsParams) (*ETGBCustomsDeclarationsResponse, error) {
url := "/v1/posting/global/etgb" url := "/v1/posting/global/etgb"
resp := &ETGBCustomsDeclarationsResponse{} resp := &ETGBCustomsDeclarationsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2675,12 +2690,12 @@ type BarcodeFromProductShipmentResponse struct {
} }
// Method for getting a barcode to show at a pick-up point or sorting center during the shipment // Method for getting a barcode to show at a pick-up point or sorting center during the shipment
func (c FBS) BarcodeFromProductShipment(params *BarcodeFromProductShipmentParams) (*BarcodeFromProductShipmentResponse, error) { func (c FBS) BarcodeFromProductShipment(ctx context.Context, params *BarcodeFromProductShipmentParams) (*BarcodeFromProductShipmentResponse, error) {
url := "/v2/posting/fbs/act/get-barcode" url := "/v2/posting/fbs/act/get-barcode"
resp := &BarcodeFromProductShipmentResponse{} resp := &BarcodeFromProductShipmentResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "image/png", "Content-Type": "image/png",
}) })
if err != nil { if err != nil {
@@ -2704,12 +2719,12 @@ type BarcodeValueFromProductShipmentResponse struct {
} }
// Use this method to get the barcode from the /v2/posting/fbs/act/get-barcode response in text format. // Use this method to get the barcode from the /v2/posting/fbs/act/get-barcode response in text format.
func (c FBS) BarcodeValueFromProductShipment(params *BarcodeValueFromProductShipmentParams) (*BarcodeValueFromProductShipmentResponse, error) { func (c FBS) BarcodeValueFromProductShipment(ctx context.Context, params *BarcodeValueFromProductShipmentParams) (*BarcodeValueFromProductShipmentResponse, error) {
url := "/v2/posting/fbs/act/get-barcode/text" url := "/v2/posting/fbs/act/get-barcode/text"
resp := &BarcodeValueFromProductShipmentResponse{} resp := &BarcodeValueFromProductShipmentResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2742,12 +2757,12 @@ type GetActPDFResponse struct {
// If you are not connected to electronic document circulation (EDC), the method returns an acceptance and transfer certificate and a waybill. // If you are not connected to electronic document circulation (EDC), the method returns an acceptance and transfer certificate and a waybill.
// //
// If you are connected to EDC, the method returns a waybill only. // If you are connected to EDC, the method returns a waybill only.
func (c FBS) GetActPDF(params *GetActPDFParams) (*GetActPDFResponse, error) { func (c FBS) GetActPDF(ctx context.Context, params *GetActPDFParams) (*GetActPDFResponse, error) {
url := "/v2/posting/fbs/act/get-pdf" url := "/v2/posting/fbs/act/get-pdf"
resp := &GetActPDFResponse{} resp := &GetActPDFResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, map[string]string{ response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, map[string]string{
"Content-Type": "application/pdf", "Content-Type": "application/pdf",
}) })
if err != nil { if err != nil {

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -167,7 +168,8 @@ func TestListUnprocessedShipments(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ListUnprocessedShipments(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ListUnprocessedShipments(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -278,7 +280,8 @@ func TestGetFBSShipmentsList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetFBSShipmentsList(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetFBSShipmentsList(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -339,7 +342,8 @@ func TestPackOrder(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().PackOrder(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().PackOrder(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -416,7 +420,8 @@ func TestValidateLabelingCodes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ValidateLabelingCodes(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ValidateLabelingCodes(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -529,7 +534,8 @@ func TestGetShipmentDataByBarcode(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetShipmentDataByBarcode(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetShipmentDataByBarcode(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -642,7 +648,8 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetShipmentDataByIdentifier(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetShipmentDataByIdentifier(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -714,7 +721,8 @@ func TestAddTrackingNumbers(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().AddTrackingNumbers(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().AddTrackingNumbers(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -807,7 +815,8 @@ func TestListOfShipmentCertificates(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ListOfShipmentCertificates(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ListOfShipmentCertificates(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -868,7 +877,8 @@ func TestSignShipmentCertificate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().SignShipmentCertificate(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().SignShipmentCertificate(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -943,22 +953,26 @@ func TestChangeStatusTo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
deliveringResp, err := c.FBS().ChangeStatusToDelivering(test.params) deliveringctx, _ := context.WithTimeout(context.Background(), testTimeout)
deliveringResp, err := c.FBS().ChangeStatusToDelivering(deliveringctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
lastMileResp, err := c.FBS().ChangeStatusToLastMile(test.params) lastMilectx, _ := context.WithTimeout(context.Background(), testTimeout)
lastMileResp, err := c.FBS().ChangeStatusToLastMile(lastMilectx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
deliveredResp, err := c.FBS().ChangeStatusToDelivered(test.params) deliveredctx, _ := context.WithTimeout(context.Background(), testTimeout)
deliveredResp, err := c.FBS().ChangeStatusToDelivered(deliveredctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
sendBySellerResp, err := c.FBS().ChangeStatusToSendBySeller(test.params) sendBySellerctx, _ := context.WithTimeout(context.Background(), testTimeout)
sendBySellerResp, err := c.FBS().ChangeStatusToSendBySeller(sendBySellerctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1005,7 +1019,8 @@ func TestPassShipmentToShipping(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().PassShipmentToShipping(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().PassShipmentToShipping(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1053,7 +1068,8 @@ func TestCancelShipment(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().CancelShipment(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().CancelShipment(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1103,7 +1119,8 @@ func TestCreateAct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().CreateAct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().CreateAct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1152,7 +1169,8 @@ func TestGetLabeling(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetLabeling(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetLabeling(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1205,7 +1223,8 @@ func TestPrintLabeling(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().PrintLabeling(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().PrintLabeling(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1259,7 +1278,8 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().CreateTaskForGeneratingLabel(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().CreateTaskForGeneratingLabel(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1319,7 +1339,8 @@ func TestGetDropOffPointRestrictions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetDropOffPointRestrictions(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetDropOffPointRestrictions(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1379,7 +1400,8 @@ func TestCheckProductItemsData(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().CheckproductItemsData(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().CheckproductItemsData(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1442,7 +1464,8 @@ func TestGetProductItemsCheckStatuses(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetProductItemsCheckStatuses(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetProductItemsCheckStatuses(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1510,7 +1533,8 @@ func TestRescheduleShipmentDeliveryDate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().RescheduleShipmentDeliveryDate(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().RescheduleShipmentDeliveryDate(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1561,7 +1585,8 @@ func TestDateAvailableForDeliverySchedule(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().DateAvailableForDeliverySchedule(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().DateAvailableForDeliverySchedule(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1620,7 +1645,8 @@ func TestListManufactoruingCountries(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ListManufacturingCountries(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ListManufacturingCountries(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1680,7 +1706,8 @@ func TestSetManufacturingCountry(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().SetManufacturingCountry(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().SetManufacturingCountry(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1747,7 +1774,8 @@ func TestPartialPackOrder(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().PartialPackOrder(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().PartialPackOrder(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1819,7 +1847,8 @@ func TestAvailableFreightsList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().AvailableFreightsList(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().AvailableFreightsList(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1866,7 +1895,8 @@ func TestGenerateAct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GenerateAct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GenerateAct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1915,7 +1945,8 @@ func TestGetDigitalAct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetDigitalAct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetDigitalAct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1969,7 +2000,8 @@ func TestPackageUnitLabels(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().PackageUnitLabel(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().PackageUnitLabel(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2021,7 +2053,8 @@ func TestOpenDisputeOverShipment(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().OpenDisputeOverShipment(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().OpenDisputeOverShipment(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2088,7 +2121,8 @@ func TestShipmentCancellationReasons(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ShipmentCancellationReasons(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ShipmentCancellationReasons(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2183,7 +2217,8 @@ func TestShipmentsCancellationReasons(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ShipmentsCancellationReasons() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ShipmentsCancellationReasons(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2244,7 +2279,8 @@ func TestAddWeightForBulkProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().AddWeightForBulkProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().AddWeightForBulkProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2304,7 +2340,8 @@ func TestCancelSending(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().CancelSending(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().CancelSending(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2369,7 +2406,8 @@ func TestListShipmentInCertificate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ListShipmentInCertificate(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ListShipmentInCertificate(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2417,7 +2455,8 @@ func TestSpecifyNumberOfBoxes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().SpecifyNumberOfBoxes(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().SpecifyNumberOfBoxes(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2465,7 +2504,8 @@ func TestStatusOfAct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().StatusOfAct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().StatusOfAct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2523,7 +2563,8 @@ func TestETGBCustomsDeclarations(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().ETGBCustomsDeclarations(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().ETGBCustomsDeclarations(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2571,7 +2612,8 @@ func TestBarcodeFromProductShipment(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().BarcodeFromProductShipment(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().BarcodeFromProductShipment(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2629,7 +2671,8 @@ func TestBarcodeValueFromProductShipment(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().BarcodeValueFromProductShipment(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().BarcodeValueFromProductShipment(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2683,7 +2726,8 @@ func TestGetActPDF(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.FBS().GetActPDF(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.FBS().GetActPDF(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -25,10 +26,8 @@ func TestReportOnSoldProducts(t *testing.T) {
Date: "2022-09", Date: "2022-09",
}, },
`{ `{
"result": [ "result": {
{ "header": {
"header": [
{
"doc_date": "2022-09-22", "doc_date": "2022-09-22",
"num": "string", "num": "string",
"start_date": "2022-09-02", "start_date": "2022-09-02",
@@ -44,8 +43,7 @@ func TestReportOnSoldProducts(t *testing.T) {
"doc_amount": 1, "doc_amount": 1,
"vat_amount": 1, "vat_amount": 1,
"currency_code": "string" "currency_code": "string"
} },
],
"rows": [ "rows": [
{ {
"row_number": 0, "row_number": 0,
@@ -70,7 +68,6 @@ func TestReportOnSoldProducts(t *testing.T) {
} }
] ]
} }
]
}`, }`,
"", "",
}, },
@@ -90,7 +87,8 @@ func TestReportOnSoldProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Finance().ReportOnSoldProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Finance().ReportOnSoldProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -158,7 +156,8 @@ func TestGetTotalTransactionsSum(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Finance().GetTotalTransactionsSum(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Finance().GetTotalTransactionsSum(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -246,7 +245,8 @@ func TestListTransactions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Finance().ListTransactions(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Finance().ListTransactions(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -82,12 +83,12 @@ type GetStocksInfoResultItemStock struct {
// * how many items are available, // * how many items are available,
// //
// * how many are reserved by customers. // * how many are reserved by customers.
func (c Products) GetStocksInfo(params *GetStocksInfoParams) (*GetStocksInfoResponse, error) { func (c Products) GetStocksInfo(ctx context.Context, params *GetStocksInfoParams) (*GetStocksInfoResponse, error) {
url := "/v3/product/info/stocks" url := "/v3/product/info/stocks"
resp := &GetStocksInfoResponse{} resp := &GetStocksInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -127,7 +128,7 @@ type ProductDetails struct {
BuyboxPrice string `json:"buybox_price"` BuyboxPrice string `json:"buybox_price"`
// Category identifier // Category identifier
CategoryId int64 `json:"category_id"` DescriptionCategoryId int64 `json:"description_category_id"`
// Marketing color // Marketing color
ColorImage string `json:"color_image"` ColorImage string `json:"color_image"`
@@ -138,11 +139,8 @@ type ProductDetails struct {
// Date and time when the product was created // Date and time when the product was created
CreatedAt time.Time `json:"created_at"` CreatedAt time.Time `json:"created_at"`
// SKU of the product that is sold from the Ozon warehouse (FBO) // Product SKU
FBOSKU int64 `json:"fbo_sku"` SKU int64 `json:"sku"`
// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
FBSSKU int64 `json:"fbs_sku"`
// Document generation task number // Document generation task number
Id int64 `json:"id"` Id int64 `json:"id"`
@@ -422,12 +420,15 @@ type GetProductDetailsResponseItemError struct {
} }
// Get product details // Get product details
func (c Products) GetProductDetails(params *GetProductDetailsParams) (*GetProductDetailsResponse, error) { //
// Check a minimum product price with all promotions applied in your personal account.
// The min_price parameter from the method response is in development and returns 0
func (c Products) GetProductDetails(ctx context.Context, params *GetProductDetailsParams) (*GetProductDetailsResponse, error) {
url := "/v2/product/info" url := "/v2/product/info"
resp := &GetProductDetailsResponse{} resp := &GetProductDetailsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -487,12 +488,12 @@ type UpdateStocksResultError struct {
// With one request you can change the availability for 100 products. You can send up to 80 requests in a minute. // With one request you can change the availability for 100 products. You can send up to 80 requests in a minute.
// //
// Availability can only be set after the product status has been changed to processed. // Availability can only be set after the product status has been changed to processed.
func (c Products) UpdateStocks(params *UpdateStocksParams) (*UpdateStocksResponse, error) { func (c Products) UpdateStocks(ctx context.Context, params *UpdateStocksParams) (*UpdateStocksResponse, error) {
url := "/v1/product/import/stocks" url := "/v1/product/import/stocks"
resp := &UpdateStocksResponse{} resp := &UpdateStocksResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -561,12 +562,12 @@ type UpdateQuantityStockProductsResultError struct {
// Availability can only be set after the product status has been changed to processed. // Availability can only be set after the product status has been changed to processed.
// //
// Bulky products stock can only be updated in the warehouses for bulky products. // Bulky products stock can only be updated in the warehouses for bulky products.
func (c Products) UpdateQuantityStockProducts(params *UpdateQuantityStockProductsParams) (*UpdateQuantityStockProductsResponse, error) { func (c Products) UpdateQuantityStockProducts(ctx context.Context, params *UpdateQuantityStockProductsParams) (*UpdateQuantityStockProductsResponse, error) {
url := "/v2/products/stocks" url := "/v2/products/stocks"
resp := &UpdateQuantityStockProductsResponse{} resp := &UpdateQuantityStockProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -576,12 +577,8 @@ func (c Products) UpdateQuantityStockProducts(params *UpdateQuantityStockProduct
} }
type StocksInSellersWarehouseParams struct { type StocksInSellersWarehouseParams struct {
// SKU of the product that is sold from the seller's warehouse (FBS and RFBS schemes). // Product SKU
// SKU []string `json:"sku"`
// Get fbs_sku in the /v2/product/info and /v2/product/info/list methods response.
//
// The maximum number of SKUs per request is 500.
FBSSKU []string `json:"fbs_sku"`
} }
type StocksInSellersWarehouseResponse struct { type StocksInSellersWarehouseResponse struct {
@@ -593,7 +590,7 @@ type StocksInSellersWarehouseResponse struct {
type StocksInSellersWarehouseResult struct { type StocksInSellersWarehouseResult struct {
// SKU of the product that is sold from the seller's warehouse (FBS and RFBS schemes) // SKU of the product that is sold from the seller's warehouse (FBS and RFBS schemes)
FBSSKU int64 `json:"fbs_sku"` SKU int64 `json:"sku"`
// Total number of items in the warehouse // Total number of items in the warehouse
Present int64 `json:"present"` Present int64 `json:"present"`
@@ -612,12 +609,12 @@ type StocksInSellersWarehouseResult struct {
} }
// Get stocks in seller's warehouse // Get stocks in seller's warehouse
func (c Products) StocksInSellersWarehouse(params *StocksInSellersWarehouseParams) (*StocksInSellersWarehouseResponse, error) { func (c Products) StocksInSellersWarehouse(ctx context.Context, params *StocksInSellersWarehouseParams) (*StocksInSellersWarehouseResponse, error) {
url := "/v1/product/info/stocks-by-warehouse/fbs" url := "/v1/product/info/stocks-by-warehouse/fbs"
resp := &StocksInSellersWarehouseResponse{} resp := &StocksInSellersWarehouseResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -647,12 +644,24 @@ type UpdatePricesPrice struct {
OfferId string `json:"offer_id"` OfferId string `json:"offer_id"`
// Price before discounts. Displayed strikethrough on the product description page. // Price before discounts. Displayed strikethrough on the product description page.
// Specified in rubles. The fractional part is separated by decimal point, up to two digits after the decimal point. // Specified in rubles.
// The fractional part is separated by decimal point,
// up to two digits after the decimal point.
//
// If there are no discounts on the product, pass 0 to this field and specify the correct price in the price field
OldPrice string `json:"old_price"` OldPrice string `json:"old_price"`
// Product price including discounts. This value is displayed on the product description page. // Product price including discounts. This value is displayed on the product description page.
// //
// If the current price of the product is from 400 to 10 000 rubles inclusive, the difference between the values of price and old_price fields should be more than 5%, but not less than 20 rubles. // If the old_price parameter value is greater than 0,
// there should be a certain difference between price and old_price.
// It depends on the price value
//
// < 400 - min diff. 20 rubles
//
// 400-10,000 - min diff. 5%
//
// > 10,000 - min diff. 500 rubles
Price string `json:"price"` Price string `json:"price"`
// Attribute for enabling and disabling pricing strategies auto-application // Attribute for enabling and disabling pricing strategies auto-application
@@ -698,12 +707,12 @@ type UpdatePricesResultError struct {
// To reset old_price or premium_price set these parameters to 0. // To reset old_price or premium_price set these parameters to 0.
// //
// A new price must differ from the old one by at least 5%. // A new price must differ from the old one by at least 5%.
func (c Products) UpdatePrices(params *UpdatePricesParams) (*UpdatePricesResponse, error) { func (c Products) UpdatePrices(ctx context.Context, params *UpdatePricesParams) (*UpdatePricesResponse, error) {
url := "/v1/product/import/prices" url := "/v1/product/import/prices"
resp := &UpdatePricesResponse{} resp := &UpdatePricesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -727,7 +736,7 @@ type CreateOrUpdateProductItem struct {
Barcode string `json:"barcode"` Barcode string `json:"barcode"`
// Category identifier // Category identifier
CategoryId int64 `json:"category_id"` DescriptionCategoryId int64 `json:"description_category_id"`
// Marketing color. // Marketing color.
// //
@@ -873,12 +882,12 @@ type CreateOrUpdateProductResult struct {
} }
// This method allows you to create products and update their details // This method allows you to create products and update their details
func (c Products) CreateOrUpdateProduct(params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) { func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
url := "/v2/product/import" url := "/v2/product/import"
resp := &CreateOrUpdateProductResponse{} resp := &CreateOrUpdateProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -939,12 +948,12 @@ type GetListOfProductsResultItem struct {
ProductId int64 `json:"product_id"` ProductId int64 `json:"product_id"`
} }
func (c Products) GetListOfProducts(params *GetListOfProductsParams) (*GetListOfProductsResponse, error) { func (c Products) GetListOfProducts(ctx context.Context, params *GetListOfProductsParams) (*GetListOfProductsResponse, error) {
url := "/v2/product/list" url := "/v2/product/list"
resp := &GetListOfProductsResponse{} resp := &GetListOfProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1022,12 +1031,12 @@ type GetProductsRatingBySKUProductGroupImproveAttr struct {
} }
// Method for getting products' content rating and recommendations on how to increase it // Method for getting products' content rating and recommendations on how to increase it
func (c Products) GetProductsRatingBySKU(params *GetProductsRatingBySKUParams) (*GetProductsRatingBySKUResponse, error) { func (c Products) GetProductsRatingBySKU(ctx context.Context, params *GetProductsRatingBySKUParams) (*GetProductsRatingBySKUResponse, error) {
url := "/v1/product/rating-by-sku" url := "/v1/product/rating-by-sku"
resp := &GetProductsRatingBySKUResponse{} resp := &GetProductsRatingBySKUResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1083,12 +1092,12 @@ type GetProductImportStatusResultItemError struct {
} }
// Allows you to get the status of a product description page creation process // Allows you to get the status of a product description page creation process
func (c Products) GetProductImportStatus(params *GetProductImportStatusParams) (*GetProductImportStatusResponse, error) { func (c Products) GetProductImportStatus(ctx context.Context, params *GetProductImportStatusParams) (*GetProductImportStatusResponse, error) {
url := "/v1/product/import/info" url := "/v1/product/import/info"
resp := &GetProductImportStatusResponse{} resp := &GetProductImportStatusResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1151,12 +1160,12 @@ type CreateProductByOzonIDResponse struct {
// Creates a product by the specified Ozon ID. The number of products is unlimited. // Creates a product by the specified Ozon ID. The number of products is unlimited.
// //
// It's not possible to update products using Ozon ID // It's not possible to update products using Ozon ID
func (c Products) CreateProductByOzonID(params *CreateProductByOzonIDParams) (*CreateProductByOzonIDResponse, error) { func (c Products) CreateProductByOzonID(ctx context.Context, params *CreateProductByOzonIDParams) (*CreateProductByOzonIDResponse, error) {
url := "/v1/product/import-by-sku" url := "/v1/product/import-by-sku"
resp := &CreateProductByOzonIDResponse{} resp := &CreateProductByOzonIDResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1240,12 +1249,12 @@ type ProductInfoResultPicture struct {
// first get the details using `/v2/product/info` or `/v2/product/info/list` methods. // first get the details using `/v2/product/info` or `/v2/product/info/list` methods.
// Using them you can get the current list of images and their order. // Using them you can get the current list of images and their order.
// Copy the data from the images, images360, and color_image fields and make the necessary changes to it // Copy the data from the images, images360, and color_image fields and make the necessary changes to it
func (c Products) UpdateProductImages(params *UpdateProductImagesParams) (*ProductInfoResponse, error) { func (c Products) UpdateProductImages(ctx context.Context, params *UpdateProductImagesParams) (*ProductInfoResponse, error) {
url := "/v1/product/pictures/import" url := "/v1/product/pictures/import"
resp := &ProductInfoResponse{} resp := &ProductInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1260,12 +1269,12 @@ type CheckImageUploadingStatusParams struct {
} }
// Check products images uploading status // Check products images uploading status
func (c Products) CheckImageUploadingStatus(params *CheckImageUploadingStatusParams) (*ProductInfoResponse, error) { func (c Products) CheckImageUploadingStatus(ctx context.Context, params *CheckImageUploadingStatusParams) (*ProductInfoResponse, error) {
url := "/v1/product/pictures/info" url := "/v1/product/pictures/info"
resp := &ProductInfoResponse{} resp := &ProductInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1302,12 +1311,12 @@ type ListProductsByIDsResult struct {
// The request body must contain an array of identifiers of the same type. The response will contain an items array. // The request body must contain an array of identifiers of the same type. The response will contain an items array.
// //
// For each shipment in the items array the fields match the ones recieved in the /v2/product/info method // For each shipment in the items array the fields match the ones recieved in the /v2/product/info method
func (c Products) ListProductsByIDs(params *ListProductsByIDsParams) (*ListProductsByIDsResponse, error) { func (c Products) ListProductsByIDs(ctx context.Context, params *ListProductsByIDsParams) (*ListProductsByIDsResponse, error) {
url := "/v2/product/info/list" url := "/v2/product/info/list"
resp := &ListProductsByIDsResponse{} resp := &ListProductsByIDsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1369,7 +1378,7 @@ type GetDescriptionOfProductResult struct {
Barcode string `json:"barcode"` Barcode string `json:"barcode"`
// Category identifier // Category identifier
CategoryId int64 `json:"category_id"` DescriptionCategoryId int64 `json:"description_category_id"`
// Marketing color // Marketing color
ColorImage string `json:"color_image"` ColorImage string `json:"color_image"`
@@ -1490,12 +1499,12 @@ type GetDescriptionOfProductResultPDF struct {
} }
// Returns a product characteristics description by product identifier. You can search for the product by `offer_id` or `product_id` // Returns a product characteristics description by product identifier. You can search for the product by `offer_id` or `product_id`
func (c Products) GetDescriptionOfProduct(params *GetDescriptionOfProductParams) (*GetDescriptionOfProductResponse, error) { func (c Products) GetDescriptionOfProduct(ctx context.Context, params *GetDescriptionOfProductParams) (*GetDescriptionOfProductResponse, error) {
url := "/v3/products/info/attributes" url := "/v3/products/info/attributes"
resp := &GetDescriptionOfProductResponse{} resp := &GetDescriptionOfProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1534,12 +1543,12 @@ type GetProductDescriptionResult struct {
} }
// Get product description // Get product description
func (c Products) GetProductDescription(params *GetProductDescriptionParams) (*GetProductDescriptionResponse, error) { func (c Products) GetProductDescription(ctx context.Context, params *GetProductDescriptionParams) (*GetProductDescriptionResponse, error) {
url := "/v1/product/info/description" url := "/v1/product/info/description"
resp := &GetProductDescriptionResponse{} resp := &GetProductDescriptionResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1586,12 +1595,12 @@ type GetProductRangeLimitUploadQuota struct {
// - Products update limit: how many products you can update per day. // - Products update limit: how many products you can update per day.
// //
// If you have a product range limit and you exceed it, you won't be able to create new products // If you have a product range limit and you exceed it, you won't be able to create new products
func (c Products) GetProductRangeLimit() (*GetProductRangeLimitResponse, error) { func (c Products) GetProductRangeLimit(ctx context.Context) (*GetProductRangeLimitResponse, error) {
url := "/v4/product/info/limit" url := "/v4/product/info/limit"
resp := &GetProductRangeLimitResponse{} resp := &GetProductRangeLimitResponse{}
response, err := c.client.Request(http.MethodPost, url, &struct{}{}, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, &struct{}{}, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1633,12 +1642,12 @@ type ChangeProductIDsError struct {
// Method for changing the offer_id linked to products. You can change multiple offer_id in this method. // Method for changing the offer_id linked to products. You can change multiple offer_id in this method.
// //
// We recommend transmitting up to 250 values in an array // We recommend transmitting up to 250 values in an array
func (c Products) ChangeProductIDs(params *ChangeProductIDsParams) (*ChangeProductIDsResponse, error) { func (c Products) ChangeProductIDs(ctx context.Context, params *ChangeProductIDsParams) (*ChangeProductIDsResponse, error) {
url := "/v1/product/update/offer-id" url := "/v1/product/update/offer-id"
resp := &ChangeProductIDsResponse{} resp := &ChangeProductIDsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1660,12 +1669,12 @@ type ArchiveProductResponse struct {
} }
// Archive product // Archive product
func (c Products) ArchiveProduct(params *ArchiveProductParams) (*ArchiveProductResponse, error) { func (c Products) ArchiveProduct(ctx context.Context, params *ArchiveProductParams) (*ArchiveProductResponse, error) {
url := "/v1/product/archive" url := "/v1/product/archive"
resp := &ArchiveProductResponse{} resp := &ArchiveProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1677,12 +1686,12 @@ func (c Products) ArchiveProduct(params *ArchiveProductParams) (*ArchiveProductR
// Warning: Since June 14, 2023 the method is disabled. // Warning: Since June 14, 2023 the method is disabled.
// //
// Unarchive product // Unarchive product
func (c Products) UnarchiveProduct(params *ArchiveProductParams) (*ArchiveProductResponse, error) { func (c Products) UnarchiveProduct(ctx context.Context, params *ArchiveProductParams) (*ArchiveProductResponse, error) {
url := "/v1/product/unarchive" url := "/v1/product/unarchive"
resp := &ArchiveProductResponse{} resp := &ArchiveProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1722,12 +1731,12 @@ type RemoveProductWithoutSKUStatus struct {
// Remove a product without an SKU from the archive // Remove a product without an SKU from the archive
// //
// You can pass up to 500 identifiers in one request // You can pass up to 500 identifiers in one request
func (c Products) RemoveProductWithoutSKU(params *RemoveProductWithoutSKUParams) (*RemoveProductWithoutSKUResponse, error) { func (c Products) RemoveProductWithoutSKU(ctx context.Context, params *RemoveProductWithoutSKUParams) (*RemoveProductWithoutSKUResponse, error) {
url := "/v2/products/delete" url := "/v2/products/delete"
resp := &RemoveProductWithoutSKUResponse{} resp := &RemoveProductWithoutSKUResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1783,12 +1792,12 @@ type ListGeoRestrictionsRestriction struct {
} }
// Get a list of geo-restrictions for services // Get a list of geo-restrictions for services
func (c Products) ListGeoRestrictions(params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) { func (c Products) ListGeoRestrictions(ctx context.Context, params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) {
url := "/v1/products/geo-restrictions-catalog-by-filter" url := "/v1/products/geo-restrictions-catalog-by-filter"
resp := &ListGeoRestrictionsResponse{} resp := &ListGeoRestrictionsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1818,12 +1827,12 @@ type UploadActivationCodesResult struct {
} }
// Upload activation codes when you upload service or digital products. Activation code is associated with the digital product card // Upload activation codes when you upload service or digital products. Activation code is associated with the digital product card
func (c Products) UploadActivationCodes(params *UploadActivationCodesParams) (*UploadActivationCodesResponse, error) { func (c Products) UploadActivationCodes(ctx context.Context, params *UploadActivationCodesParams) (*UploadActivationCodesResponse, error) {
url := "/v1/product/upload_digital_codes" url := "/v1/product/upload_digital_codes"
resp := &UploadActivationCodesResponse{} resp := &UploadActivationCodesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1853,12 +1862,12 @@ type StatusOfUploadingActivationCodesResult struct {
} }
// Get status of uploading activation codes task for services and digital products // Get status of uploading activation codes task for services and digital products
func (c Products) StatusOfUploadingActivationCodes(params *StatusOfUploadingActivationCodesParams) (*StatusOfUploadingActivationCodesResponse, error) { func (c Products) StatusOfUploadingActivationCodes(ctx context.Context, params *StatusOfUploadingActivationCodesParams) (*StatusOfUploadingActivationCodesResponse, error) {
url := "/v1/product/upload_digital_codes/info" url := "/v1/product/upload_digital_codes/info"
resp := &StatusOfUploadingActivationCodesResponse{} resp := &StatusOfUploadingActivationCodesResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2112,12 +2121,16 @@ type GetProductPriceInfoResultItemPriceIndexesSelfMarketplace struct {
} }
// You can specify up to 1000 products in the request // You can specify up to 1000 products in the request
func (c Products) GetProductPriceInfo(params *GetProductPriceInfoParams) (*GetProductPriceInfoResponse, error) { //
// Check minimum and maximum commissions for FBO pipeline in your personal account.
// The `fbo_direct_flow_trans_max_amount` and `fbo_direct_flow_trans_min_amount` parameters
// from the method response are in development and return 0
func (c Products) GetProductPriceInfo(ctx context.Context, params *GetProductPriceInfoParams) (*GetProductPriceInfoResponse, error) {
url := "/v4/product/info/prices" url := "/v4/product/info/prices"
resp := &GetProductPriceInfoResponse{} resp := &GetProductPriceInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2188,12 +2201,12 @@ type GetMarkdownInfoItem struct {
// //
// A method for getting information about the condition and defects of a markdown product by its SKU. // A method for getting information about the condition and defects of a markdown product by its SKU.
// The method also returns the SKU of the main product // The method also returns the SKU of the main product
func (c Products) GetMarkdownInfo(params *GetMarkdownInfoParams) (*GetMarkdownInfoResponse, error) { func (c Products) GetMarkdownInfo(ctx context.Context, params *GetMarkdownInfoParams) (*GetMarkdownInfoResponse, error) {
url := "/v1/product/info/discounted" url := "/v1/product/info/discounted"
resp := &GetMarkdownInfoResponse{} resp := &GetMarkdownInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2218,12 +2231,12 @@ type SetDiscountOnMarkdownProductResponse struct {
} }
// A method for setting the discount percentage on markdown products sold under the FBS scheme // A method for setting the discount percentage on markdown products sold under the FBS scheme
func (c Products) SetDiscountOnMarkdownProduct(params *SetDiscountOnMarkdownProductParams) (*SetDiscountOnMarkdownProductResponse, error) { func (c Products) SetDiscountOnMarkdownProduct(ctx context.Context, params *SetDiscountOnMarkdownProductParams) (*SetDiscountOnMarkdownProductResponse, error) {
url := "/v1/product/update/discount" url := "/v1/product/update/discount"
resp := &SetDiscountOnMarkdownProductResponse{} resp := &SetDiscountOnMarkdownProductResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2253,12 +2266,12 @@ type NumberOfSubsToProductAvailabilityResult struct {
} }
// You can pass multiple products in a request // You can pass multiple products in a request
func (c Products) NumberOfSubsToProductAvailability(params *NumberOfSubsToProductAvailabilityParams) (*NumberOfSubsToProductAvailabilityResponse, error) { func (c Products) NumberOfSubsToProductAvailability(ctx context.Context, params *NumberOfSubsToProductAvailabilityParams) (*NumberOfSubsToProductAvailabilityResponse, error) {
url := "/v1/product/info/subscription" url := "/v1/product/info/subscription"
resp := &NumberOfSubsToProductAvailabilityResponse{} resp := &NumberOfSubsToProductAvailabilityResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -2309,12 +2322,73 @@ type UpdateCharacteristicsResponse struct {
TaskId int64 `json:"task_id"` TaskId int64 `json:"task_id"`
} }
func (c Products) UpdateCharacteristics(params *UpdateCharacteristicsParams) (*UpdateCharacteristicsResponse, error) { func (c Products) UpdateCharacteristics(ctx context.Context, params *UpdateCharacteristicsParams) (*UpdateCharacteristicsResponse, error) {
url := "/v1/product/attributes/update" url := "/v1/product/attributes/update"
resp := &UpdateCharacteristicsResponse{} resp := &UpdateCharacteristicsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil {
return nil, err
}
response.CopyCommonResponse(&resp.CommonResponse)
return resp, nil
}
type GetRelatedSKUsParams struct {
// List of SKUs
SKUs []string `json:"sku"`
}
type GetRelatedSKUsResponse struct {
core.CommonResponse
// Related SKUs information
Items []GetRelatedSKUsItem `json:"items"`
// Errors
Errors []GetRelatedSKUsError `json:"errors"`
}
type GetRelatedSKUsItem struct {
// Product availability attribute by SKU
Availability SKUAvailability `json:"availability"`
// Date and time of deletion
DeletedAt time.Time `json:"deleted_at"`
// Delivery scheme
DeliverySchema string `json:"delivery_schema"`
// Product identifier
ProductId int64 `json:"product_id"`
// Product identifier in the Ozon system, SKU
SKU int64 `json:"sku"`
}
type GetRelatedSKUsError struct {
// Error code
Code string `json:"code"`
// SKU, in which the error occurred
SKU int `json:"sku"`
// Error text
Message string `json:"message"`
}
// You can pass any SKU in the request, even a deleted one.
// The response will contain all SKUs related to the passed ones.
//
// In one request, you can pass up to 200 SKUs.
func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsParams) (*GetRelatedSKUsResponse, error) {
url := "/v1/product/related-sku/get"
resp := &GetRelatedSKUsResponse{}
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"testing" "testing"
@@ -70,7 +71,8 @@ func TestGetStocksInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetStocksInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetStocksInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -122,7 +124,7 @@ func TestGetProductDetails(t *testing.T) {
"7533900005" "7533900005"
], ],
"buybox_price": "", "buybox_price": "",
"category_id": 17038062, "description_category_id": 17038062,
"created_at": "2021-10-21T15:48:03.529178Z", "created_at": "2021-10-21T15:48:03.529178Z",
"images": [ "images": [
"https://cdn1.ozone.ru/s3/multimedia-5/6088931525.jpg", "https://cdn1.ozone.ru/s3/multimedia-5/6088931525.jpg",
@@ -267,7 +269,8 @@ func TestGetProductDetails(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductDetails(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductDetails(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -283,7 +286,7 @@ func TestGetProductDetails(t *testing.T) {
if resp.Result.OfferId == "" { if resp.Result.OfferId == "" {
t.Errorf("Offer id cannot be empty") t.Errorf("Offer id cannot be empty")
} }
if resp.Result.CategoryId == 0 { if resp.Result.DescriptionCategoryId == 0 {
t.Errorf("Category id cannot be 0") t.Errorf("Category id cannot be 0")
} }
if resp.Result.CurrencyCode == "" { if resp.Result.CurrencyCode == "" {
@@ -341,7 +344,8 @@ func TestUpdateStocks(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UpdateStocks(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UpdateStocks(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -380,12 +384,12 @@ func TestStocksInSellersWarehouse(t *testing.T) {
http.StatusOK, http.StatusOK,
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"}, map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
&StocksInSellersWarehouseParams{ &StocksInSellersWarehouseParams{
FBSSKU: []string{"123"}, SKU: []string{"123"},
}, },
`{ `{
"result": [ "result": [
{ {
"fbs_sku": 12, "sku": 12,
"present": 34, "present": 34,
"product_id": 548761, "product_id": 548761,
"reserved": 5, "reserved": 5,
@@ -410,7 +414,8 @@ func TestStocksInSellersWarehouse(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().StocksInSellersWarehouse(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().StocksInSellersWarehouse(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -420,11 +425,11 @@ func TestStocksInSellersWarehouse(t *testing.T) {
} }
if resp.StatusCode == http.StatusOK { if resp.StatusCode == http.StatusOK {
if len(resp.Result) != len(test.params.FBSSKU) { if len(resp.Result) != len(test.params.SKU) {
t.Errorf("Length of skus in request and response must be equal") t.Errorf("Length of skus in request and response must be equal")
} }
if len(resp.Result) > 0 { if len(resp.Result) > 0 {
if fmt.Sprint(resp.Result[0].FBSSKU) == test.params.FBSSKU[0] { if fmt.Sprint(resp.Result[0].SKU) == test.params.SKU[0] {
t.Errorf("fbs sku in request and response are not equal") t.Errorf("fbs sku in request and response are not equal")
} }
} }
@@ -484,7 +489,8 @@ func TestUpdatePrices(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UpdatePrices(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UpdatePrices(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -556,7 +562,8 @@ func TestUpdateQuantityStockProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UpdateQuantityStockProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UpdateQuantityStockProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -652,7 +659,7 @@ func TestCreateOrUpdateProduct(t *testing.T) {
}, },
}, },
Barcode: "112772873170", Barcode: "112772873170",
CategoryId: 17033876, DescriptionCategoryId: 17033876,
CurrencyCode: "RUB", CurrencyCode: "RUB",
Depth: 10, Depth: 10,
DimensionUnit: "mm", DimensionUnit: "mm",
@@ -690,7 +697,8 @@ func TestCreateOrUpdateProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().CreateOrUpdateProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().CreateOrUpdateProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -757,7 +765,8 @@ func TestGetListOfProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetListOfProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetListOfProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1003,7 +1012,8 @@ func TestGetProductsRatingBySKU(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductsRatingBySKU(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductsRatingBySKU(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1070,7 +1080,8 @@ func TestGetProductImportStatus(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductImportStatus(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductImportStatus(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1141,7 +1152,8 @@ func TestCreateProductByOzonID(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().CreateProductByOzonID(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().CreateProductByOzonID(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1209,7 +1221,8 @@ func TestUpdateProductImages(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UpdateProductImages(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UpdateProductImages(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1277,7 +1290,8 @@ func TestCheckImageUploadingStatus(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().CheckImageUploadingStatus(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().CheckImageUploadingStatus(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1325,7 +1339,7 @@ func TestListProductsByIDs(t *testing.T) {
"7533900005" "7533900005"
], ],
"buybox_price": "", "buybox_price": "",
"category_id": 93726157, "description_category_id": 93726157,
"created_at": "2021-06-03T03:40:05.871465Z", "created_at": "2021-06-03T03:40:05.871465Z",
"images": [], "images": [],
"has_discounted_item": true, "has_discounted_item": true,
@@ -1472,7 +1486,8 @@ func TestListProductsByIDs(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().ListProductsByIDs(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().ListProductsByIDs(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1521,7 +1536,7 @@ func TestGetDescriptionOfProduct(t *testing.T) {
{ {
"id": 213761435, "id": 213761435,
"barcode": "", "barcode": "",
"category_id": 17038062, "description_category_id": 17038062,
"name": "Пленка защитная для Xiaomi Redmi Note 10 Pro 5G", "name": "Пленка защитная для Xiaomi Redmi Note 10 Pro 5G",
"offer_id": "21470", "offer_id": "21470",
"height": 10, "height": 10,
@@ -1706,7 +1721,8 @@ func TestGetDescriptionOfProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetDescriptionOfProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetDescriptionOfProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1764,7 +1780,8 @@ func TestGetProductDescription(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductDescription(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductDescription(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1827,7 +1844,8 @@ func TestGetProductRangeLimit(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductRangeLimit() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductRangeLimit(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1883,7 +1901,8 @@ func TestChangeProductIDs(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().ChangeProductIDs(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().ChangeProductIDs(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1929,7 +1948,8 @@ func TestArchiveProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().ArchiveProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().ArchiveProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -1975,7 +1995,8 @@ func TestUnarchiveProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UnarchiveProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UnarchiveProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2031,7 +2052,8 @@ func TestRemoveProductWithoutSKU(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().RemoveProductWithoutSKU(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().RemoveProductWithoutSKU(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2108,7 +2130,8 @@ func TestListGeoRestrictions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().ListGeoRestrictions(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().ListGeoRestrictions(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2157,7 +2180,8 @@ func TestUploadActivationCodes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UploadActivationCodes(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UploadActivationCodes(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2205,7 +2229,8 @@ func TestStatusOfUploadingActivationCodes(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().StatusOfUploadingActivationCodes(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().StatusOfUploadingActivationCodes(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2318,7 +2343,8 @@ func TestGetProductPriceInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetProductPriceInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetProductPriceInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2380,7 +2406,8 @@ func TestGetMarkdownInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().GetMarkdownInfo(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetMarkdownInfo(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2435,7 +2462,8 @@ func TestSetDiscountOnMarkdownProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().SetDiscountOnMarkdownProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().SetDiscountOnMarkdownProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2486,7 +2514,8 @@ func TestNumberOfSubsToProductAvailability(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().NumberOfSubsToProductAvailability(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().NumberOfSubsToProductAvailability(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2560,7 +2589,8 @@ func TestUpdateCharacteristics(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Products().UpdateCharacteristics(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().UpdateCharacteristics(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -2570,3 +2600,69 @@ func TestUpdateCharacteristics(t *testing.T) {
} }
} }
} }
func TestGetRelatedSKUs(t *testing.T) {
t.Parallel()
tests := []struct {
statusCode int
headers map[string]string
params *GetRelatedSKUsParams
response string
}{
// Test Ok
{
http.StatusOK,
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
&GetRelatedSKUsParams{
SKUs: []string{"321", "322"},
},
`{
"items": [
{
"availability": "HIDDEN",
"deleted_at": "2019-08-24T14:15:22Z",
"delivery_schema": "fbs",
"product_id": 123,
"sku": 321
}
],
"errors": [
{
"code": "test_code",
"sku": 322,
"message": "test_message"
}
]
}`,
},
// Test No Client-Id or Api-Key
{
http.StatusUnauthorized,
map[string]string{},
&GetRelatedSKUsParams{},
`{
"code": 16,
"message": "Client-Id and Api-Key headers are required"
}`,
},
}
for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Products().GetRelatedSKUs(ctx, test.params)
if err != nil {
t.Error(err)
}
if resp.StatusCode != test.statusCode {
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
}
if len(resp.Errors)+len(resp.Items) != len(test.params.SKUs) {
t.Errorf("expected equal length of skus in request and response")
}
}
}

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -73,12 +74,12 @@ type GetAvailablePromotionsResult struct {
} }
// A method for getting a list of promotions that you can participate in // A method for getting a list of promotions that you can participate in
func (c Promotions) GetAvailablePromotions() (*GetAvailablePromotionsResponse, error) { func (c Promotions) GetAvailablePromotions(ctx context.Context) (*GetAvailablePromotionsResponse, error) {
url := "/v1/actions" url := "/v1/actions"
resp := &GetAvailablePromotionsResponse{} resp := &GetAvailablePromotionsResponse{}
response, err := c.client.Request(http.MethodGet, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodGet, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -130,12 +131,12 @@ type AddProductToPromotionResultRejected struct {
} }
// A method for adding products to an available promotion // A method for adding products to an available promotion
func (c Promotions) AddToPromotion(params *AddProductToPromotionParams) (*AddProductToPromotionResponse, error) { func (c Promotions) AddToPromotion(ctx context.Context, params *AddProductToPromotionParams) (*AddProductToPromotionResponse, error) {
url := "/v1/actions/products/activate" url := "/v1/actions/products/activate"
resp := &AddProductToPromotionResponse{} resp := &AddProductToPromotionResponse{}
response, err := c.client.Request(http.MethodGet, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -195,12 +196,12 @@ type PromotionProduct struct {
} }
// A method for getting a list of products that can participate in the promotion by the promotion identifier // A method for getting a list of products that can participate in the promotion by the promotion identifier
func (c Promotions) ProductsAvailableForPromotion(params *ProductsAvailableForPromotionParams) (*ProductsAvailableForPromotionResponse, error) { func (c Promotions) ProductsAvailableForPromotion(ctx context.Context, params *ProductsAvailableForPromotionParams) (*ProductsAvailableForPromotionResponse, error) {
url := "/v1/actions/candidates" url := "/v1/actions/candidates"
resp := &ProductsAvailableForPromotionResponse{} resp := &ProductsAvailableForPromotionResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -236,12 +237,12 @@ type ProductsInPromotionResult struct {
} }
// A method for getting the list of products participating in the promotion by its identifier // A method for getting the list of products participating in the promotion by its identifier
func (c Promotions) ProductsInPromotion(params *ProductsInPromotionParams) (*ProductsInPromotionResponse, error) { func (c Promotions) ProductsInPromotion(ctx context.Context, params *ProductsInPromotionParams) (*ProductsInPromotionResponse, error) {
url := "/v1/actions/products" url := "/v1/actions/products"
resp := &ProductsInPromotionResponse{} resp := &ProductsInPromotionResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -282,12 +283,12 @@ type RemoveProductFromPromotionResultRejected struct {
} }
// A method for removing products from the promotion // A method for removing products from the promotion
func (c Promotions) RemoveProduct(params *RemoveProductFromPromotionParams) (*RemoveProductFromPromotionResponse, error) { func (c Promotions) RemoveProduct(ctx context.Context, params *RemoveProductFromPromotionParams) (*RemoveProductFromPromotionResponse, error) {
url := "/v1/actions/products/deactivate" url := "/v1/actions/products/deactivate"
resp := &RemoveProductFromPromotionResponse{} resp := &RemoveProductFromPromotionResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -332,12 +333,12 @@ type ListHotSalePromotionsResult struct {
} }
// List of available Hot Sale promotions // List of available Hot Sale promotions
func (c Promotions) ListHotSalePromotions() (*ListHotSalePromotionsResponse, error) { func (c Promotions) ListHotSalePromotions(ctx context.Context) (*ListHotSalePromotionsResponse, error) {
url := "/v1/actions/hotsales/list" url := "/v1/actions/hotsales/list"
resp := &ListHotSalePromotionsResponse{} resp := &ListHotSalePromotionsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -396,12 +397,12 @@ type ProductsAvailableForHotSalePromotionResultProduct struct {
} }
// Method for getting a list of products that can participate or are already participating in the Hot Sale promotion // Method for getting a list of products that can participate or are already participating in the Hot Sale promotion
func (c Promotions) ProductsAvailableForHotSalePromotion(params *ProductsAvailableForHotSalePromotionParams) (*ProductsAvailableForHotSalePromotionResponse, error) { func (c Promotions) ProductsAvailableForHotSalePromotion(ctx context.Context, params *ProductsAvailableForHotSalePromotionParams) (*ProductsAvailableForHotSalePromotionResponse, error) {
url := "/v1/actions/hotsales/products" url := "/v1/actions/hotsales/products"
resp := &ProductsAvailableForHotSalePromotionResponse{} resp := &ProductsAvailableForHotSalePromotionResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -449,12 +450,12 @@ type ProductsToHotSaleResultRejected struct {
Reason string `json:"reason"` Reason string `json:"reason"`
} }
func (c Promotions) AddProductsToHotSale(params *AddProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) { func (c Promotions) AddProductsToHotSale(ctx context.Context, params *AddProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
url := "/v1/actions/hotsales/activate" url := "/v1/actions/hotsales/activate"
resp := &ProductsToHotSaleResponse{} resp := &ProductsToHotSaleResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -472,12 +473,12 @@ type RemoveProductsToHotSaleParams struct {
} }
// Remove product from the Hot Sale promotion // Remove product from the Hot Sale promotion
func (c Promotions) RemoveProductsToHotSale(params *RemoveProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) { func (c Promotions) RemoveProductsToHotSale(ctx context.Context, params *RemoveProductsToHotSaleParams) (*ProductsToHotSaleResponse, error) {
url := "/v1/actions/hotsales/activate" url := "/v1/actions/hotsales/activate"
resp := &ProductsToHotSaleResponse{} resp := &ProductsToHotSaleResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -612,12 +613,12 @@ type ListDiscountRequestsResult struct {
} }
// Method for getting a list of products that customers want to buy with discount // Method for getting a list of products that customers want to buy with discount
func (c Promotions) ListDiscountRequests(params *ListDiscountRequestsParams) (*ListDiscountRequestsResponse, error) { func (c Promotions) ListDiscountRequests(ctx context.Context, params *ListDiscountRequestsParams) (*ListDiscountRequestsResponse, error) {
url := "/v1/actions/discounts-task/list" url := "/v1/actions/discounts-task/list"
resp := &ListDiscountRequestsResponse{} resp := &ListDiscountRequestsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -677,12 +678,12 @@ type DiscountRequestResultFailDetail struct {
// You can approve applications in statuses: // You can approve applications in statuses:
// - NEW — new // - NEW — new
// - SEEN — viewed // - SEEN — viewed
func (c Promotions) ApproveDiscountRequest(params *DiscountRequestParams) (*DiscountRequestResponse, error) { func (c Promotions) ApproveDiscountRequest(ctx context.Context, params *DiscountRequestParams) (*DiscountRequestResponse, error) {
url := "/v1/actions/discounts-task/approve" url := "/v1/actions/discounts-task/approve"
resp := &DiscountRequestResponse{} resp := &DiscountRequestResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -694,12 +695,12 @@ func (c Promotions) ApproveDiscountRequest(params *DiscountRequestParams) (*Disc
// You can decline applications in statuses: // You can decline applications in statuses:
// - NEW—new // - NEW—new
// - SEEN—viewed // - SEEN—viewed
func (c Promotions) DeclineDiscountRequest(params *DiscountRequestParams) (*DiscountRequestResponse, error) { func (c Promotions) DeclineDiscountRequest(ctx context.Context, params *DiscountRequestParams) (*DiscountRequestResponse, error) {
url := "/v1/actions/discounts-task/decline" url := "/v1/actions/discounts-task/decline"
resp := &DiscountRequestResponse{} resp := &DiscountRequestResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -56,7 +57,8 @@ func TestGetAvailablePromotions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().GetAvailablePromotions() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().GetAvailablePromotions(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -125,7 +127,8 @@ func TestAddToPromotion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().AddToPromotion(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().AddToPromotion(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -201,7 +204,8 @@ func TestProductsAvailableForPromotion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ProductsAvailableForPromotion(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ProductsAvailableForPromotion(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -262,7 +266,8 @@ func TestProductsInPromotion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ProductsInPromotion(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ProductsInPromotion(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -314,7 +319,8 @@ func TestRemoveProduct(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().RemoveProduct(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().RemoveProduct(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -373,7 +379,8 @@ func TestListHotSalePromotions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ListHotSalePromotions() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ListHotSalePromotions(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -434,7 +441,8 @@ func TestProductsAvailableForHotSalePromotion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ProductsAvailableForHotSalePromotion(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ProductsAvailableForHotSalePromotion(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -494,7 +502,8 @@ func TestAddProductsToHotSale(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().AddProductsToHotSale(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().AddProductsToHotSale(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -548,7 +557,8 @@ func TestRemoveProductsToHotSale(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().RemoveProductsToHotSale(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().RemoveProductsToHotSale(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -634,7 +644,8 @@ func TestListDiscountRequests(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ListDiscountRequests(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ListDiscountRequests(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -697,7 +708,8 @@ func TestApproveDiscountRequest(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().ApproveDiscountRequest(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().ApproveDiscountRequest(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -760,7 +772,8 @@ func TestDeclineDiscountRequest(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Promotions().DeclineDiscountRequest(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Promotions().DeclineDiscountRequest(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -90,12 +91,12 @@ type GetCurrentSellerRatingInfoGroupItemChange struct {
Meaning string `json:"meaning"` Meaning string `json:"meaning"`
} }
func (c Rating) GetCurrentSellerRatingInfo() (*GetCurrentSellerRatingInfoResponse, error) { func (c Rating) GetCurrentSellerRatingInfo(ctx context.Context) (*GetCurrentSellerRatingInfoResponse, error) {
url := "/v1/rating/summary" url := "/v1/rating/summary"
resp := &GetCurrentSellerRatingInfoResponse{} resp := &GetCurrentSellerRatingInfoResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -189,12 +190,12 @@ type GetSellerRatingInfoPeriodRatingValueStatus struct {
Warning bool `json:"warning"` Warning bool `json:"warning"`
} }
func (c Rating) GetSellerRatingInfoForPeriod(params *GetSellerRatingInfoForPeriodParams) (*GetSellerRatingInfoPeriodResponse, error) { func (c Rating) GetSellerRatingInfoForPeriod(ctx context.Context, params *GetSellerRatingInfoForPeriodParams) (*GetSellerRatingInfoPeriodResponse, error) {
url := "/v1/rating/history" url := "/v1/rating/history"
resp := &GetSellerRatingInfoPeriodResponse{} resp := &GetSellerRatingInfoPeriodResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -58,7 +59,8 @@ func TestGetCurrentRatingInfo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Rating().GetCurrentSellerRatingInfo() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Rating().GetCurrentSellerRatingInfo(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -146,7 +148,8 @@ func TestGetRatingInfoForPeriod(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Rating().GetSellerRatingInfoForPeriod(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Rating().GetSellerRatingInfoForPeriod(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -83,12 +84,12 @@ type GetReportsListResultReport struct {
} }
// Returns the list of reports that have been generated before // Returns the list of reports that have been generated before
func (c Reports) GetList(params *GetReportsListParams) (*GetReportsListResponse, error) { func (c Reports) GetList(ctx context.Context, params *GetReportsListParams) (*GetReportsListResponse, error) {
url := "/v1/report/list" url := "/v1/report/list"
resp := &GetReportsListResponse{} resp := &GetReportsListResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -125,30 +126,20 @@ type GetReportDetailResult struct {
// Array with the filters specified when the seller created the report // Array with the filters specified when the seller created the report
Params map[string]string `json:"params"` Params map[string]string `json:"params"`
// Report type: // Report type
// - SELLER_PRODUCTS — products report, ReportType ReportType `json:"report_type"`
// - SELLER_TRANSACTIONS — transactions report,
// - SELLER_PRODUCT_PRICES — product prices report,
// - SELLER_STOCK — stocks report,
// - SELLER_PRODUCT_MOVEMENT — products movement report,
// - SELLER_RETURNS — returns report,
// - SELLER_POSTINGS — shipments report,
// - SELLER_FINANCE — financial report
ReportType string `json:"report_type"`
// Report generation status: // Report generation status
// - success Status ReportInfoStatus `json:"status"`
// - failed
Status string `json:"status"`
} }
// Returns information about a created report by its identifier // Returns information about a created report by its identifier
func (c Reports) GetReportDetails(params *GetReportDetailsParams) (*GetReportDetailsResponse, error) { func (c Reports) GetReportDetails(ctx context.Context, params *GetReportDetailsParams) (*GetReportDetailsResponse, error) {
url := "/v1/report/info" url := "/v1/report/info"
resp := &GetReportDetailsResponse{} resp := &GetReportDetailsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -392,12 +383,12 @@ type GetFinancialResultResultDetailOthersItem struct {
} }
// Returns information about a created report by its identifier // Returns information about a created report by its identifier
func (c Reports) GetFinancial(params *GetFinancialReportParams) (*GetFinancialReportResponse, error) { func (c Reports) GetFinancial(ctx context.Context, params *GetFinancialReportParams) (*GetFinancialReportResponse, error) {
url := "/v1/finance/cash-flow-statement/list" url := "/v1/finance/cash-flow-statement/list"
resp := &GetFinancialReportResponse{} resp := &GetFinancialReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -440,12 +431,12 @@ type GetProductsReportResult struct {
} }
// Method for getting a report with products data. For example, Ozon ID, number of products, prices, status // Method for getting a report with products data. For example, Ozon ID, number of products, prices, status
func (c Reports) GetProducts(params *GetProductsReportParams) (*GetProductsReportResponse, error) { func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParams) (*GetProductsReportResponse, error) {
url := "/v1/report/products/create" url := "/v1/report/products/create"
resp := &GetProductsReportResponse{} resp := &GetProductsReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -475,12 +466,12 @@ type GetStocksReportResult struct {
} }
// Report with information about the number of available and reserved products in stock // Report with information about the number of available and reserved products in stock
func (c Reports) GetStocks(params *GetStocksReportParams) (*GetStocksReportResponse, error) { func (c Reports) GetStocks(ctx context.Context, params *GetStocksReportParams) (*GetStocksReportResponse, error) {
url := "/v1/report/stock/create" url := "/v1/report/stock/create"
resp := &GetStocksReportResponse{} resp := &GetStocksReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -520,12 +511,12 @@ type GetProductsMovementReportResult struct {
// - products in transit between the fulfillment centers, // - products in transit between the fulfillment centers,
// - products in delivery, // - products in delivery,
// - products to be sold // - products to be sold
func (c Reports) GetProductsMovement(params *GetProductsMovementReportParams) (*GetProductsMovementReportResponse, error) { func (c Reports) GetProductsMovement(ctx context.Context, params *GetProductsMovementReportParams) (*GetProductsMovementReportResponse, error) {
url := "/v1/report/products/movement/create" url := "/v1/report/products/movement/create"
resp := &GetProductsMovementReportResponse{} resp := &GetProductsMovementReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -571,12 +562,12 @@ type GetReturnReportResult struct {
// The report contains information about returned products that were accepted from the customer, ready for pickup, or delivered to the seller. // 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 // The method is only suitable for orders shipped from the seller's warehouse
func (c Reports) GetReturns(params *GetReturnsReportParams) (*GetReturnsReportResponse, error) { func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams) (*GetReturnsReportResponse, error) {
url := "/v1/report/returns/create" url := "/v1/report/returns/create"
resp := &GetReturnsReportResponse{} resp := &GetReturnsReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -646,12 +637,12 @@ type GetShipmentReportResult struct {
// - shipment numbers // - shipment numbers
// - shipment costs // - shipment costs
// - shipments contents // - shipments contents
func (c Reports) GetShipment(params *GetShipmentReportParams) (*GetShipmentReportResponse, error) { func (c Reports) GetShipment(ctx context.Context, params *GetShipmentReportParams) (*GetShipmentReportResponse, error) {
url := "/v1/report/postings/create" url := "/v1/report/postings/create"
resp := &GetShipmentReportResponse{} resp := &GetShipmentReportResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -671,12 +662,12 @@ type IssueOnDiscountedProductsResponse struct {
// For example, Ozon can discount a product due to damage when delivering. // For example, Ozon can discount a product due to damage when delivering.
// //
// Returns report identifier. To get the report, send the identifier in the request body of a method `/v1/report/discounted/info` // Returns report identifier. To get the report, send the identifier in the request body of a method `/v1/report/discounted/info`
func (c Reports) IssueOnDiscountedProducts() (*IssueOnDiscountedProductsResponse, error) { func (c Reports) IssueOnDiscountedProducts(ctx context.Context) (*IssueOnDiscountedProductsResponse, error) {
url := "/v1/report/discounted/create" url := "/v1/report/discounted/create"
resp := &IssueOnDiscountedProductsResponse{} resp := &IssueOnDiscountedProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -716,12 +707,12 @@ type ReportonDiscountedProductsReport struct {
} }
// By report identifier, returns information about the report generated earlier // By report identifier, returns information about the report generated earlier
func (c Reports) ReportOnDiscountedProducts(params *ReportOnDiscountedProductsParams) (*ReportOnDiscountedProductsResponse, error) { func (c Reports) ReportOnDiscountedProducts(ctx context.Context, params *ReportOnDiscountedProductsParams) (*ReportOnDiscountedProductsResponse, error) {
url := "/v1/report/discounted/info" url := "/v1/report/discounted/info"
resp := &ReportOnDiscountedProductsResponse{} resp := &ReportOnDiscountedProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -731,12 +722,12 @@ func (c Reports) ReportOnDiscountedProducts(params *ReportOnDiscountedProductsPa
} }
// By report identifier, returns information about the report generated earlier // By report identifier, returns information about the report generated earlier
func (c Reports) ListReportsOnDiscountedProducts() (*ReportOnDiscountedProductsResponse, error) { func (c Reports) ListReportsOnDiscountedProducts(ctx context.Context) (*ReportOnDiscountedProductsResponse, error) {
url := "/v1/report/discounted/list" url := "/v1/report/discounted/list"
resp := &ReportOnDiscountedProductsResponse{} resp := &ReportOnDiscountedProductsResponse{}
response, err := c.client.Request(http.MethodPost, url, nil, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -69,7 +70,8 @@ func TestGetList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetList(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetList(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -130,7 +132,8 @@ func TestGetReportDetails(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetReportDetails(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetReportDetails(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -274,7 +277,8 @@ func TestGetFinancialReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetFinancial(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetFinancial(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -328,7 +332,8 @@ func TestGetProductsReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -380,7 +385,8 @@ func TestGetStocksReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetStocks(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetStocks(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -435,7 +441,8 @@ func TestGetProductsMovementReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetProductsMovement(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetProductsMovement(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -491,7 +498,8 @@ func TestGetReturnsReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetReturns(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetReturns(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -549,7 +557,8 @@ func TestGetShipmentReport(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().GetShipment(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().GetShipment(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -596,7 +605,8 @@ func TestIssueOnDiscountedProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().IssueOnDiscountedProducts() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().IssueOnDiscountedProducts(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -653,7 +663,8 @@ func TestReportOnDiscountedProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().ReportOnDiscountedProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().ReportOnDiscountedProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -701,7 +712,8 @@ func TestListReportsOnDiscountedProducts(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Reports().ListReportsOnDiscountedProducts() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Reports().ListReportsOnDiscountedProducts(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"time" "time"
@@ -78,12 +79,12 @@ type GetFBOReturnsReturn struct {
} }
// Method for getting information on returned products that are sold from the Ozon warehouse // Method for getting information on returned products that are sold from the Ozon warehouse
func (c Returns) GetFBOReturns(params *GetFBOReturnsParams) (*GetFBOReturnsResponse, error) { func (c Returns) GetFBOReturns(ctx context.Context, params *GetFBOReturnsParams) (*GetFBOReturnsResponse, error) {
url := "/v3/returns/company/fbo" url := "/v3/returns/company/fbo"
resp := &GetFBOReturnsResponse{} resp := &GetFBOReturnsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -247,12 +248,12 @@ type GetFBSReturnResultReturn struct {
} }
// Method for getting information on returned products that are sold from the seller's warehouse // Method for getting information on returned products that are sold from the seller's warehouse
func (c Returns) GetFBSReturns(params *GetFBSReturnsParams) (*GetFBSReturnsResponse, error) { func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams) (*GetFBSReturnsResponse, error) {
url := "/v3/returns/company/fbs" url := "/v3/returns/company/fbs"
resp := &GetFBSReturnsResponse{} resp := &GetFBSReturnsResponse{}
response, err := c.client.Request(http.MethodPost, url, params, resp, nil) response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -61,7 +62,8 @@ func TestGetFBOReturns(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Returns().GetFBOReturns(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Returns().GetFBOReturns(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -159,7 +161,8 @@ func TestGetFBSReturns(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Returns().GetFBSReturns(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Returns().GetFBSReturns(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -49,7 +50,8 @@ func TestListCompetitors(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().ListCompetitors(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().ListCompetitors(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -108,7 +110,8 @@ func TestListStrategies(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().List(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().List(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -174,7 +177,8 @@ func TestCreateStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().Create(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().Create(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -235,7 +239,8 @@ func TestInfoStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().Info(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().Info(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -302,7 +307,8 @@ func TestUpdateStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().Update(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().Update(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -351,7 +357,8 @@ func TestAddProductsToStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().AddProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().AddProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -404,7 +411,8 @@ func TestGetStrategiesByProductIds(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().GetByProductIds(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().GetByProductIds(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -466,7 +474,8 @@ func TestListProductsInStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().ListProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().ListProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -519,7 +528,8 @@ func TestGetCompetitorPrice(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().GetCompetitorPrice(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().GetCompetitorPrice(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -567,7 +577,8 @@ func TestRemoveProductsFromStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().RemoveProducts(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().RemoveProducts(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -612,7 +623,8 @@ func TestChangeStrategyStatus(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().ChangeStatus(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().ChangeStatus(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -656,7 +668,8 @@ func TestRemoveStrategy(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Strategies().Remove(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Strategies().Remove(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

View File

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

View File

@@ -1,6 +1,7 @@
package ozon package ozon
import ( import (
"context"
"net/http" "net/http"
"testing" "testing"
@@ -58,7 +59,8 @@ func TestGetListOfWarehouses(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Warehouses().GetListOfWarehouses() ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Warehouses().GetListOfWarehouses(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -133,7 +135,8 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
for _, test := range tests { for _, test := range tests {
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers)) c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
resp, err := c.Warehouses().GetListOfDeliveryMethods(test.params) ctx, _ := context.WithTimeout(context.Background(), testTimeout)
resp, err := c.Warehouses().GetListOfDeliveryMethods(ctx, test.params)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }