Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23ca98fedd | ||
|
|
eae6f54e71 | ||
|
|
8a6cd20b95 | ||
|
|
1706575a34 | ||
|
|
3430ead143 | ||
|
|
2164eff0a6 | ||
|
|
b6af642636 | ||
|
|
67898a4738 | ||
|
|
8c07540d28 | ||
|
|
7c0e18681b | ||
|
|
895ef8be52 | ||
|
|
ccd3610c76 | ||
|
|
090b2afb63 | ||
|
|
823386edf2 | ||
|
|
5ecf131061 | ||
|
|
dfbb93f438 | ||
|
|
b0c133ba40 | ||
|
|
680a155294 | ||
|
|
26e2c8b9a7 | ||
|
|
b26dd5bbee | ||
|
|
9ea138003c | ||
|
|
5d62c8ec14 | ||
|
|
2e284d9667 | ||
|
|
7ffcf3f235 | ||
|
|
ad2eb19325 | ||
|
|
99b0a24d48 | ||
|
|
e5867813ab | ||
|
|
b0e1210f34 | ||
|
|
049b02835b | ||
|
|
6cf4ae89e3 | ||
|
|
8a6ca3b2eb | ||
|
|
25051ee802 | ||
|
|
61a78b1c4c | ||
|
|
97a9d2aba5 | ||
|
|
f02e71d17e | ||
|
|
e6bfa30545 | ||
|
|
f6311fe59e | ||
|
|
8e73d136f2 | ||
|
|
7d8f43540f | ||
|
|
114a5b90b9 | ||
|
|
a0995a79e1 | ||
|
|
2f94b8c774 | ||
|
|
35832e6269 | ||
|
|
965c83ba85 | ||
|
|
a3c9d93adc | ||
|
|
549a2b9b41 |
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -25,7 +25,7 @@ jobs:
|
|||||||
- name: Setup go
|
- name: Setup go
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v2
|
||||||
with:
|
with:
|
||||||
go-version: '1.19'
|
go-version: '1.20'
|
||||||
- name: Setup
|
- name: Setup
|
||||||
run: |
|
run: |
|
||||||
go install github.com/mattn/goveralls@latest
|
go install github.com/mattn/goveralls@latest
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
- [x] Product category tree
|
- [x] Product category tree
|
||||||
- [x] Category characteristics list
|
- [x] Category characteristics list
|
||||||
- [x] Characteristics value directory
|
- [x] Characteristics value directory
|
||||||
|
- [x] Search characteristics value directory
|
||||||
|
|
||||||
## Uploading and updating products
|
## Uploading and updating products
|
||||||
- [x] Create or update a product
|
- [x] Create or update a product
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -23,6 +23,7 @@ A simple example on how to use this library:
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -33,11 +34,14 @@ import (
|
|||||||
func main() {
|
func main() {
|
||||||
// Create a client with your Client-Id and Api-Key
|
// Create a client with your Client-Id and Api-Key
|
||||||
// [Documentation]: https://docs.ozon.ru/api/seller/en/#tag/Auth
|
// [Documentation]: https://docs.ozon.ru/api/seller/en/#tag/Auth
|
||||||
client := ozon.NewClient("my-client-id", "my-api-key")
|
opts := []ozon.ClientOption{
|
||||||
|
ozon.WithAPIKey("api-key"),
|
||||||
|
ozon.WithClientId("client-id"),
|
||||||
|
}
|
||||||
|
c := ozon.NewClient(opts...)
|
||||||
|
|
||||||
// Send request with parameters
|
// Send request with parameters
|
||||||
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
resp, err := client.Products().GetProductDetails(context.Background(), &ozon.GetProductDetailsParams{
|
||||||
resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
|
|
||||||
ProductId: 123456789,
|
ProductId: 123456789,
|
||||||
})
|
})
|
||||||
if err != nil || resp.StatusCode != http.StatusOK {
|
if err != nil || resp.StatusCode != http.StatusOK {
|
||||||
|
|||||||
19
client.go
19
client.go
@@ -8,6 +8,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
type HttpClient interface {
|
type HttpClient interface {
|
||||||
@@ -36,10 +37,21 @@ func NewMockClient(handler http.HandlerFunc) *Client {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
|
func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
|
||||||
bodyJson, err := json.Marshal(body)
|
var err error
|
||||||
|
var bodyJson []byte
|
||||||
|
|
||||||
|
// Set default values for empty fields if `default` tag is present
|
||||||
|
// And body is not nil
|
||||||
|
if body != nil {
|
||||||
|
if err := getDefaultValues(reflect.ValueOf(body)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
bodyJson, err = json.Marshal(body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
uri, err = url.JoinPath(c.baseUrl, uri)
|
uri, err = url.JoinPath(c.baseUrl, uri)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -62,11 +74,6 @@ func (c Client) Request(ctx context.Context, method string, path string, req, re
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
rawQuery, err := buildRawQuery(httpReq, req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
httpReq.URL.RawQuery = rawQuery
|
|
||||||
|
|
||||||
httpResp, err := c.client.Do(httpReq)
|
httpResp, err := c.client.Do(httpReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
172
core.go
172
core.go
@@ -4,6 +4,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -32,51 +34,103 @@ func (r Response) CopyCommonResponse(rhs *CommonResponse) {
|
|||||||
rhs.Message = r.Message
|
rhs.Message = r.Message
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDefaultValues(v interface{}) (map[string]string, error) {
|
func getDefaultValues(v reflect.Value) error {
|
||||||
isNil, err := isZero(v)
|
vValue := v.Elem()
|
||||||
if err != nil {
|
vType := vValue.Type()
|
||||||
return make(map[string]string), err
|
|
||||||
}
|
|
||||||
|
|
||||||
if isNil {
|
|
||||||
return make(map[string]string), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
out := make(map[string]string)
|
|
||||||
|
|
||||||
vType := reflect.TypeOf(v).Elem()
|
|
||||||
vValue := reflect.ValueOf(v).Elem()
|
|
||||||
|
|
||||||
for i := 0; i < vType.NumField(); i++ {
|
for i := 0; i < vType.NumField(); i++ {
|
||||||
field := vType.Field(i)
|
field := vType.Field(i)
|
||||||
tag := field.Tag.Get("json")
|
|
||||||
defaultValue := field.Tag.Get("default")
|
|
||||||
|
|
||||||
if field.Type.Kind() == reflect.Slice {
|
switch field.Type.Kind() {
|
||||||
// Attach any slices as query params
|
case reflect.Slice:
|
||||||
fieldVal := vValue.Field(i)
|
for j := 0; j < vValue.Field(i).Len(); j++ {
|
||||||
for j := 0; j < fieldVal.Len(); j++ {
|
// skip if slice type is primitive
|
||||||
out[tag] = fmt.Sprintf("%v", fieldVal.Index(j))
|
if vValue.Field(i).Index(j).Kind() != reflect.Struct {
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Add any scalar values as query params
|
|
||||||
fieldVal := fmt.Sprintf("%v", vValue.Field(i))
|
|
||||||
|
|
||||||
// If no value was set by the user, use the default
|
|
||||||
// value specified in the struct tag.
|
|
||||||
if fieldVal == "" || fieldVal == "0" {
|
|
||||||
if defaultValue == "" {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
fieldVal = defaultValue
|
// Attach any slices as query params
|
||||||
|
err := getDefaultValues(vValue.Field(i).Index(j).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case reflect.String:
|
||||||
|
isNil, err := isZero(vValue.Field(i).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !isNil {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
out[tag] = fmt.Sprintf("%v", fieldVal)
|
defaultValue, ok := field.Tag.Lookup("default")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
vValue.Field(i).SetString(defaultValue)
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
|
isNil, err := isZero(vValue.Field(i).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !isNil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultValue, ok := field.Tag.Lookup("default")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
defaultValueInt, err := strconv.Atoi(defaultValue)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
vValue.Field(i).SetInt(int64(defaultValueInt))
|
||||||
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
||||||
|
isNil, err := isZero(vValue.Field(i).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !isNil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultValue, ok := field.Tag.Lookup("default")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
defaultValueUint, err := strconv.ParseUint(defaultValue, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
vValue.Field(i).SetUint(uint64(defaultValueUint))
|
||||||
|
case reflect.Struct:
|
||||||
|
err := getDefaultValues(vValue.Field(i).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
case reflect.Ptr:
|
||||||
|
isNil, err := isZero(vValue.Field(i).Addr())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if isNil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := getDefaultValues(vValue.Field(i)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return out, nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildRawQuery(req *http.Request, v interface{}) (string, error) {
|
func buildRawQuery(req *http.Request, v interface{}) (string, error) {
|
||||||
@@ -86,23 +140,20 @@ func buildRawQuery(req *http.Request, v interface{}) (string, error) {
|
|||||||
return query.Encode(), nil
|
return query.Encode(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
values, err := getDefaultValues(v)
|
err := getDefaultValues(reflect.ValueOf(v))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
for k, v := range values {
|
|
||||||
query.Add(k, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
return query.Encode(), nil
|
return query.Encode(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isZero(v interface{}) (bool, error) {
|
func isZero(v reflect.Value) (bool, error) {
|
||||||
t := reflect.TypeOf(v)
|
t := v.Elem().Type()
|
||||||
if !t.Comparable() {
|
if !t.Comparable() {
|
||||||
return false, fmt.Errorf("type is not comparable: %v", t)
|
return false, fmt.Errorf("type is not comparable: %v", t)
|
||||||
}
|
}
|
||||||
return v == reflect.Zero(t).Interface(), nil
|
return reflect.Zero(t).Equal(v.Elem()), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func TimeFromString(t *testing.T, format, datetime string) time.Time {
|
func TimeFromString(t *testing.T, format, datetime string) time.Time {
|
||||||
@@ -112,3 +163,44 @@ func TimeFromString(t *testing.T, format, datetime string) time.Time {
|
|||||||
}
|
}
|
||||||
return dt
|
return dt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const ShortDateLayout = "2006-01-02"
|
||||||
|
|
||||||
|
// Do not use this structure for responses
|
||||||
|
// as there are no ways to unmarshal to any layout
|
||||||
|
// and leave nil if json field is null
|
||||||
|
type TimeFormat struct {
|
||||||
|
time.Time
|
||||||
|
layout string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTimeFormat(t time.Time, layout string) *TimeFormat {
|
||||||
|
return &TimeFormat{
|
||||||
|
Time: t,
|
||||||
|
layout: layout,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTimeLayout(layout string) *TimeFormat {
|
||||||
|
return &TimeFormat{
|
||||||
|
layout: layout,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rd *TimeFormat) UnmarshalJSON(b []byte) error {
|
||||||
|
var err error
|
||||||
|
|
||||||
|
s := strings.Trim(string(b), `"`) // remove quotes
|
||||||
|
|
||||||
|
// Added for extra accuracy
|
||||||
|
// encoding/json won't invoke this method if field is null
|
||||||
|
if s == "null" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
rd.Time, err = time.Parse(rd.layout, s)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rd *TimeFormat) MarshalJSON() ([]byte, error) {
|
||||||
|
return []byte(fmt.Sprintf(`%q`, rd.Time.Format(rd.layout))), nil
|
||||||
|
}
|
||||||
|
|||||||
168
core_test.go
168
core_test.go
@@ -1,34 +1,152 @@
|
|||||||
package core
|
package core
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"encoding/json"
|
||||||
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TestTagDefaultValueStruct struct {
|
type DefaultStructure struct {
|
||||||
TestString string `json:"test_string" default:"something"`
|
EmptyField string `json:"empty_field" default:"empty_string"`
|
||||||
TestNumber int `json:"test_number" default:"12"`
|
Field string `json:"field" default:"string"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTagDefaultValue(t *testing.T) {
|
type DefaultRequest struct {
|
||||||
testStruct := &TestTagDefaultValueStruct{}
|
Field int `json:"field" default:"100"`
|
||||||
|
EmptyField int `json:"empty_field" default:"14"`
|
||||||
values, err := getDefaultValues(testStruct)
|
Structure DefaultStructure `json:"structure"`
|
||||||
if err != nil {
|
Slice []DefaultStructure `json:"slice"`
|
||||||
log.Fatalf("error when getting default values from tags: %s", err)
|
OptionalStructure *DefaultStructure `json:"optional_structure"`
|
||||||
}
|
EmptyOptionalStructure *DefaultStructure `json:"empty_optional_structure"`
|
||||||
|
}
|
||||||
expected := map[string]string{
|
|
||||||
"test_string": "something",
|
func TestDefaultValues(t *testing.T) {
|
||||||
"test_number": "12",
|
req := &DefaultRequest{
|
||||||
}
|
Field: 50,
|
||||||
|
Structure: DefaultStructure{
|
||||||
if len(values) != len(expected) {
|
Field: "something",
|
||||||
log.Fatalf("expected equal length of values and expected: expected: %d, got: %d", len(expected), len(values))
|
},
|
||||||
}
|
Slice: []DefaultStructure{
|
||||||
for expKey, expValue := range expected {
|
{
|
||||||
if expValue != values[expKey] {
|
Field: "something",
|
||||||
log.Fatalf("not equal values for key %s", expKey)
|
},
|
||||||
}
|
{
|
||||||
}
|
Field: "something",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
OptionalStructure: &DefaultStructure{
|
||||||
|
Field: "something",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
err := getDefaultValues(reflect.ValueOf(req))
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, 50, req.Field)
|
||||||
|
assert.Equal(t, 14, req.EmptyField)
|
||||||
|
assert.Equal(t, "something", req.Structure.Field)
|
||||||
|
assert.Equal(t, "empty_string", req.Structure.EmptyField)
|
||||||
|
assert.Equal(t, "something", req.Slice[0].Field)
|
||||||
|
assert.Equal(t, "something", req.Slice[1].Field)
|
||||||
|
assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
|
||||||
|
assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
|
||||||
|
assert.Equal(t, "something", req.OptionalStructure.Field)
|
||||||
|
assert.Equal(t, "empty_string", req.OptionalStructure.EmptyField)
|
||||||
|
assert.Equal(t, (*DefaultStructure)(nil), req.EmptyOptionalStructure)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTimeFormat(t *testing.T) {
|
||||||
|
t.Run("Time Format Marshalling", func(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
ft *TimeFormat
|
||||||
|
layout string
|
||||||
|
expectedJSON string
|
||||||
|
diff time.Duration
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
ft: NewTimeFormat(time.Date(2024, 4, 30, 15, 42, 12, 55, time.FixedZone("Test Zone", 0)), ShortDateLayout),
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `"2024-04-30"`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ft: NewTimeFormat(time.Date(2024, 4, 30, 0, 0, 0, 0, time.FixedZone("Test Zone", 0)), ShortDateLayout),
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `"2024-04-30"`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ft: NewTimeFormat(time.Time{}, ShortDateLayout),
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `"0001-01-01"`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ft: nil,
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `null`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
marshaled, err := json.Marshal(tc.ft)
|
||||||
|
assert.Equal(t, nil, err)
|
||||||
|
assert.Equal(t, tc.expectedJSON, string(marshaled))
|
||||||
|
|
||||||
|
unmarshaled := newTimeLayout(tc.layout)
|
||||||
|
err = json.Unmarshal(marshaled, unmarshaled)
|
||||||
|
assert.Equal(t, nil, err)
|
||||||
|
|
||||||
|
if tc.ft != nil {
|
||||||
|
diffedTime := tc.ft.Add(-tc.diff)
|
||||||
|
assert.Equal(t, true, diffedTime.Before(unmarshaled.Time) || diffedTime.Equal(unmarshaled.Time))
|
||||||
|
assert.Equal(t, true, tc.ft.After(unmarshaled.Time) || tc.ft.Equal(unmarshaled.Time))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Time Format in structure Marshalling", func(t *testing.T) {
|
||||||
|
type test struct {
|
||||||
|
Date *TimeFormat `json:"date"`
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
structure *test
|
||||||
|
layout string
|
||||||
|
expectedJSON string
|
||||||
|
diff time.Duration
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
structure: &test{Date: NewTimeFormat(time.Date(2024, 4, 30, 5, 4, 7, 20, time.FixedZone("Test Zone", 0)), ShortDateLayout)},
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `{"date":"2024-04-30"}`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
structure: &test{Date: nil},
|
||||||
|
layout: ShortDateLayout,
|
||||||
|
expectedJSON: `{"date":null}`,
|
||||||
|
diff: time.Hour * 24,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
marshaled, err := json.Marshal(tc.structure)
|
||||||
|
assert.Equal(t, nil, err)
|
||||||
|
assert.Equal(t, tc.expectedJSON, string(marshaled))
|
||||||
|
|
||||||
|
unmarshaled := &test{Date: newTimeLayout(tc.layout)}
|
||||||
|
err = json.Unmarshal(marshaled, unmarshaled)
|
||||||
|
assert.Equal(t, nil, err)
|
||||||
|
|
||||||
|
if tc.structure != nil && tc.structure.Date != nil {
|
||||||
|
diffedTime := tc.structure.Date.Add(-tc.diff)
|
||||||
|
assert.Equal(t, true, diffedTime.Before(unmarshaled.Date.Time) || diffedTime.Equal(unmarshaled.Date.Time))
|
||||||
|
assert.Equal(t, true, tc.structure.Date.After(unmarshaled.Date.Time) || tc.structure.Date.Equal(unmarshaled.Date.Time))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
10
go.mod
10
go.mod
@@ -1,3 +1,11 @@
|
|||||||
module github.com/diphantxm/ozon-api-client
|
module github.com/diphantxm/ozon-api-client
|
||||||
|
|
||||||
go 1.18
|
go 1.20
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/stretchr/objx v0.5.0 // indirect
|
||||||
|
github.com/stretchr/testify v1.8.4 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
|
|||||||
17
go.sum
Normal file
17
go.sum
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
|
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
|
||||||
|
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
@@ -3,7 +3,6 @@ package ozon
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
|
||||||
|
|
||||||
core "github.com/diphantxm/ozon-api-client"
|
core "github.com/diphantxm/ozon-api-client"
|
||||||
)
|
)
|
||||||
@@ -14,10 +13,10 @@ type Analytics struct {
|
|||||||
|
|
||||||
type GetAnalyticsDataParams struct {
|
type GetAnalyticsDataParams struct {
|
||||||
// Date from which the data will be in the report
|
// Date from which the data will be in the report
|
||||||
DateFrom time.Time `json:"date_from"`
|
DateFrom *core.TimeFormat `json:"date_from"`
|
||||||
|
|
||||||
// Date up to which the data will be in the report
|
// Date up to which the data will be in the report
|
||||||
DateTo time.Time `json:"date_to"`
|
DateTo *core.TimeFormat `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:
|
// Data grouping available to all sellers:
|
||||||
@@ -126,7 +125,7 @@ type GetAnalyticsDataResultData struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GetAnalyticsDataResultDimension struct {
|
type GetAnalyticsDataResultDimension struct {
|
||||||
// Identifier
|
// Product SKU
|
||||||
Id string `json:"id"`
|
Id string `json:"id"`
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
@@ -164,8 +163,8 @@ type GetStocksOnWarehousesParams struct {
|
|||||||
// Number of elements that will be skipped in the response. For example, if `offset=10`, the response will start with the 11th element found
|
// Number of elements that will be skipped in the response. For example, if `offset=10`, the response will start with the 11th element found
|
||||||
Offset int64 `json:"offset"`
|
Offset int64 `json:"offset"`
|
||||||
|
|
||||||
// Warehouse type filter:
|
// Warehouse type filter
|
||||||
WarehouseType WarehouseType `json:"warehouse_type"`
|
WarehouseType WarehouseType `json:"warehouse_type" default:"ALL"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetStocksOnWarehousesResponse struct {
|
type GetStocksOnWarehousesResponse struct {
|
||||||
@@ -201,6 +200,9 @@ type GetStocksOnWarehousesResultRow struct {
|
|||||||
|
|
||||||
// Name of the warehouse where the products are stored
|
// Name of the warehouse where the products are stored
|
||||||
WarehouseName string `json:"warehouse_name"`
|
WarehouseName string `json:"warehouse_name"`
|
||||||
|
|
||||||
|
// Number of days the stock will last based on your average daily sales
|
||||||
|
IDC float64 `json:"idc"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Report on stocks and products movement at Ozon warehouses
|
// Report on stocks and products movement at Ozon warehouses
|
||||||
@@ -217,3 +219,54 @@ func (c Analytics) GetStocksOnWarehouses(ctx context.Context, params *GetStocksO
|
|||||||
|
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type GetProductTurnoverParams struct {
|
||||||
|
// Number of values in the response
|
||||||
|
Limit int64 `json:"limit"`
|
||||||
|
|
||||||
|
// Number of elements to skip in the response.
|
||||||
|
//
|
||||||
|
// For example, if offset = 10, the response starts with the 11th element found
|
||||||
|
Offset int32 `json:"offset"`
|
||||||
|
|
||||||
|
// Product identifiers in the Ozon system, SKU
|
||||||
|
SKU []string `json:"sku"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetProductTurnoverResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Products
|
||||||
|
Items []ProductTurnoverItem `json:"items"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ProductTurnoverItem struct {
|
||||||
|
// Average daily number of product items sold over the last 60 days
|
||||||
|
Ads float64 `json:"ads"`
|
||||||
|
|
||||||
|
// Product stock, pcs
|
||||||
|
CurrentStock int64 `json:"current_stock"`
|
||||||
|
|
||||||
|
// Number of days the stock will last based on your average daily sales
|
||||||
|
IDC float64 `json:"idc"`
|
||||||
|
|
||||||
|
// Product stock level
|
||||||
|
IDCGrade string `json:"idc_grade"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use the method to get the product turnover rate and the number of days the current stock will last.
|
||||||
|
//
|
||||||
|
// If you request a list of products by sku, the limit and offset parameters are optional.
|
||||||
|
func (c Analytics) GetProductTurnover(ctx context.Context, params *GetProductTurnoverParams) (*GetProductTurnoverResponse, error) {
|
||||||
|
url := "/v1/analytics/turnover/stocks"
|
||||||
|
|
||||||
|
resp := &GetProductTurnoverResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
core "github.com/diphantxm/ozon-api-client"
|
core "github.com/diphantxm/ozon-api-client"
|
||||||
)
|
)
|
||||||
@@ -22,8 +23,8 @@ func TestGetAnalyticsData(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"},
|
||||||
&GetAnalyticsDataParams{
|
&GetAnalyticsDataParams{
|
||||||
DateFrom: core.TimeFromString(t, "2006-01-02", "2020-09-01"),
|
DateFrom: core.NewTimeFormat(time.Now().Add(time.Duration(30)*24*time.Hour), core.ShortDateLayout),
|
||||||
DateTo: core.TimeFromString(t, "2006-01-02", "2021-10-15"),
|
DateTo: core.NewTimeFormat(time.Now(), core.ShortDateLayout),
|
||||||
Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
|
Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
|
||||||
Metrics: []GetAnalyticsDataFilterMetric{HistViewPDP},
|
Metrics: []GetAnalyticsDataFilterMetric{HistViewPDP},
|
||||||
Sort: []GetAnalyticsDataSort{
|
Sort: []GetAnalyticsDataSort{
|
||||||
@@ -144,3 +145,67 @@ func TestGetStocksOnWarehouses(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetProductTurnover(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *GetProductTurnoverParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&GetProductTurnoverParams{
|
||||||
|
Limit: 1,
|
||||||
|
SKU: []string{"string"},
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"items": [
|
||||||
|
{
|
||||||
|
"ads": 0,
|
||||||
|
"current_stock": 0,
|
||||||
|
"idc": 0,
|
||||||
|
"idc_grade": "GRADES_NONE"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&GetProductTurnoverParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Analytics().GetProductTurnover(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &GetProductTurnoverResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.StatusCode == http.StatusOK {
|
||||||
|
if len(resp.Items) > int(test.params.Limit) {
|
||||||
|
t.Errorf("Length of items is bigger than limit")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ type CancellationInfo struct {
|
|||||||
CancellationReasonMessage string `json:"cancellation_reason_message"`
|
CancellationReasonMessage string `json:"cancellation_reason_message"`
|
||||||
|
|
||||||
// Delivery service integration type
|
// Delivery service integration type
|
||||||
TPLIntegrationType string `json:"tpl_integration_type"`
|
TPLIntegrationType TPLIntegrationType `json:"tpl_integration_type"`
|
||||||
|
|
||||||
// Cancellation request status
|
// Cancellation request status
|
||||||
State CancellationInfoState `json:"state"`
|
State CancellationInfoState `json:"state"`
|
||||||
@@ -83,7 +83,7 @@ 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(ctx context.Context, params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
|
func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
|
||||||
url := "/v1/delivery-method/list"
|
url := "/v1/conditional-cancellation/get"
|
||||||
|
|
||||||
resp := &GetCancellationInfoResponse{}
|
resp := &GetCancellationInfoResponse{}
|
||||||
|
|
||||||
@@ -98,30 +98,30 @@ func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoP
|
|||||||
|
|
||||||
type ListCancellationsParams struct {
|
type ListCancellationsParams struct {
|
||||||
// Filters
|
// Filters
|
||||||
Filter ListCancellationsFilter `json:"filter"`
|
Filter *ListCancellationsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Number of cancellation requests in the response
|
// Number of cancellation requests in the response
|
||||||
Limit int32 `json:"limit"`
|
Limit int32 `json:"limit,omitempty"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response.
|
// Number of elements that will be skipped in the response.
|
||||||
// For example, if offset=10, the response will start with the 11th element found
|
// For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset int32 `json:"offset"`
|
Offset int32 `json:"offset,omitempty"`
|
||||||
|
|
||||||
// Additional information
|
// Additional information
|
||||||
With ListCancellationWith `json:"with"`
|
With *ListCancellationWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListCancellationsFilter struct {
|
type ListCancellationsFilter struct {
|
||||||
// Filter by cancellation initiator
|
// Filter by cancellation initiator
|
||||||
CancellationInitiator []string `json:"cancellation_initiator"`
|
CancellationInitiator []string `json:"cancellation_initiator,omitempty"`
|
||||||
|
|
||||||
// Filter by shipment number.
|
// Filter by shipment number.
|
||||||
//
|
//
|
||||||
// Optional parameter. You can pass several values here
|
// Optional parameter. You can pass several values here
|
||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number,omitempty"`
|
||||||
|
|
||||||
// Filter by cancellation request status
|
// Filter by cancellation request status
|
||||||
State string `json:"state"`
|
State string `json:"state,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListCancellationWith struct {
|
type ListCancellationWith struct {
|
||||||
@@ -173,7 +173,7 @@ type ApproveRejectCancellationsParams struct {
|
|||||||
CancellationId int64 `json:"cancellation_id"`
|
CancellationId int64 `json:"cancellation_id"`
|
||||||
|
|
||||||
// Comment
|
// Comment
|
||||||
Comment string `json:"comment"`
|
Comment string `json:"comment,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ApproveRejectCancellationsResponse struct {
|
type ApproveRejectCancellationsResponse struct {
|
||||||
|
|||||||
@@ -98,13 +98,13 @@ func TestListCancellations(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"},
|
||||||
&ListCancellationsParams{
|
&ListCancellationsParams{
|
||||||
Filter: ListCancellationsFilter{
|
Filter: &ListCancellationsFilter{
|
||||||
CancellationInitiator: []string{"CLIENT"},
|
CancellationInitiator: []string{"CLIENT"},
|
||||||
State: "ALL",
|
State: "ALL",
|
||||||
},
|
},
|
||||||
Limit: 2,
|
Limit: 2,
|
||||||
Offset: 0,
|
Offset: 0,
|
||||||
With: ListCancellationWith{
|
With: &ListCancellationWith{
|
||||||
Counters: true,
|
Counters: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ type Categories struct {
|
|||||||
|
|
||||||
type GetProductTreeParams struct {
|
type GetProductTreeParams struct {
|
||||||
// Response language
|
// Response language
|
||||||
Language Language `json:"language"`
|
Language Language `json:"language,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetProductTreeResponse struct {
|
type GetProductTreeResponse struct {
|
||||||
@@ -67,7 +67,7 @@ type GetCategoryAttributesParams struct {
|
|||||||
DescriptionCategoryId int64 `json:"description_category_id"`
|
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||||
|
|
||||||
// Response language
|
// Response language
|
||||||
Language Language `json:"language"`
|
Language Language `json:"language,omitempty"`
|
||||||
|
|
||||||
// Product type identifier
|
// Product type identifier
|
||||||
TypeId int64 `json:"type_id"`
|
TypeId int64 `json:"type_id"`
|
||||||
@@ -81,6 +81,12 @@ type GetCategoryAttributesResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GetCategoryAttributesResult struct {
|
type GetCategoryAttributesResult 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"`
|
||||||
|
|
||||||
@@ -158,7 +164,7 @@ type GetAttributeDictionaryParams struct {
|
|||||||
DescriptionCategoryId int64 `json:"description_category_id"`
|
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||||
|
|
||||||
// Response language
|
// Response language
|
||||||
Language Language `json:"language"`
|
Language Language `json:"language,omitempty"`
|
||||||
|
|
||||||
// Identifier of the directory to start the response with.
|
// Identifier of the directory to start the response with.
|
||||||
// If `last_value_id` is 10, the response will contain directories starting from the 11th
|
// If `last_value_id` is 10, the response will contain directories starting from the 11th
|
||||||
@@ -168,7 +174,7 @@ type GetAttributeDictionaryParams struct {
|
|||||||
//
|
//
|
||||||
// - maximum—5000,
|
// - maximum—5000,
|
||||||
// - minimum—1.
|
// - minimum—1.
|
||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit,omitempty"`
|
||||||
|
|
||||||
// Product type identifier
|
// Product type identifier
|
||||||
TypeId int64 `json:"type_id"`
|
TypeId int64 `json:"type_id"`
|
||||||
@@ -218,3 +224,63 @@ func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttrib
|
|||||||
|
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SearchAttributeDictionaryParams struct {
|
||||||
|
// Characteristics identifier
|
||||||
|
AttributeId int64 `json:"attribute_id"`
|
||||||
|
|
||||||
|
// Category identifier
|
||||||
|
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||||
|
|
||||||
|
// The value to be searched for
|
||||||
|
// - minimum—2 characters
|
||||||
|
Value string `json:"value"`
|
||||||
|
|
||||||
|
// Number of values in the response:
|
||||||
|
//
|
||||||
|
// - maximum—100,
|
||||||
|
// - minimum—1.
|
||||||
|
Limit int64 `json:"limit,omitempty"`
|
||||||
|
|
||||||
|
// Product type identifier
|
||||||
|
TypeId int64 `json:"type_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SearchAttributeDictionaryResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Characteristic values
|
||||||
|
Result []SearchAttributeDictionaryResult `json:"result"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SearchAttributeDictionaryResult struct {
|
||||||
|
// Characteristic value identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
|
// Additional description
|
||||||
|
Info string `json:"info"`
|
||||||
|
|
||||||
|
// Image link
|
||||||
|
Picture string `json:"picture"`
|
||||||
|
|
||||||
|
// Product characteristic value
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns found characteristics value directory.
|
||||||
|
//
|
||||||
|
// To check if an attribute has a nested directory,
|
||||||
|
// use the `/v1/description-category/attribute` method.
|
||||||
|
func (c *Categories) SearchAttributesDictionary(ctx context.Context, params *SearchAttributeDictionaryParams) (*SearchAttributeDictionaryResponse, error) {
|
||||||
|
url := "/v1/description-category/attribute/values/search"
|
||||||
|
|
||||||
|
resp := &SearchAttributeDictionaryResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ func TestGetCategoryAttributes(t *testing.T) {
|
|||||||
`{
|
`{
|
||||||
"result": [
|
"result": [
|
||||||
{
|
{
|
||||||
|
"category_dependent": true,
|
||||||
"description": "string",
|
"description": "string",
|
||||||
"dictionary_id": 0,
|
"dictionary_id": 0,
|
||||||
"group_id": 0,
|
"group_id": 0,
|
||||||
@@ -202,3 +203,71 @@ func TestGetAttributeDictionary(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSearchAttributeDictionary(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *SearchAttributeDictionaryParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&SearchAttributeDictionaryParams{
|
||||||
|
AttributeId: 123456,
|
||||||
|
DescriptionCategoryId: 12,
|
||||||
|
Value: "34",
|
||||||
|
Limit: 5,
|
||||||
|
TypeId: 6,
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"has_next": true,
|
||||||
|
"result": [
|
||||||
|
{
|
||||||
|
"id": 0,
|
||||||
|
"info": "string",
|
||||||
|
"picture": "string",
|
||||||
|
"value": "string"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&SearchAttributeDictionaryParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Categories().SearchAttributesDictionary(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &GetAttributeDictionaryResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.StatusCode == http.StatusOK {
|
||||||
|
if len(resp.Result) > int(test.params.Limit) {
|
||||||
|
t.Errorf("Length of response result is bigger than limit")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ type ListOfCertifiedCategoriesResultCert struct {
|
|||||||
|
|
||||||
// List of certified categories
|
// List of certified categories
|
||||||
func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
|
func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
|
||||||
url := "/v1/product/certificate/types"
|
url := "/v1/product/certification/list"
|
||||||
|
|
||||||
resp := &ListOfCertifiedCategoriesResponse{}
|
resp := &ListOfCertifiedCategoriesResponse{}
|
||||||
|
|
||||||
|
|||||||
@@ -14,14 +14,14 @@ type Chats struct {
|
|||||||
|
|
||||||
type ListChatsParams struct {
|
type ListChatsParams struct {
|
||||||
// Chats filter
|
// Chats filter
|
||||||
Filter ListChatsFilter `json:"filter"`
|
Filter *ListChatsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Number of values in the response. The default value is 30. The maximum value is 1000
|
// Number of values in the response. The default value is 30. The maximum value is 1000
|
||||||
Limit int64 `json:"limit" default:"30"`
|
Limit int64 `json:"limit" default:"30"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response.
|
// Number of elements that will be skipped in the response.
|
||||||
// For example, if offset=10, the response will start with the 11th element found
|
// For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset int64 `json:"offset"`
|
Offset int64 `json:"offset,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListChatsFilter struct {
|
type ListChatsFilter struct {
|
||||||
@@ -39,7 +39,7 @@ type ListChatsResponse struct {
|
|||||||
core.CommonResponse
|
core.CommonResponse
|
||||||
|
|
||||||
// Chats data
|
// Chats data
|
||||||
Chats []ListChatsChat `json:"chats"`
|
Chats []ListChatsChatData `json:"chats"`
|
||||||
|
|
||||||
// Total number of chats
|
// Total number of chats
|
||||||
TotalChatsCount int64 `json:"total_chats_count"`
|
TotalChatsCount int64 `json:"total_chats_count"`
|
||||||
@@ -48,20 +48,6 @@ type ListChatsResponse struct {
|
|||||||
TotalUnreadCount int64 `json:"total_unread_count"`
|
TotalUnreadCount int64 `json:"total_unread_count"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListChatsChat struct {
|
|
||||||
// Chat data
|
|
||||||
Chat ListChatsChatData `json:"chat"`
|
|
||||||
|
|
||||||
// Identifier of the first unread chat message
|
|
||||||
FirstUnreadMessageId string `json:"first_unread_message_id"`
|
|
||||||
|
|
||||||
// Identifier of the last message in the chat
|
|
||||||
LastMessageId string `json:"last_message_id"`
|
|
||||||
|
|
||||||
// Number of unread messages in the chat
|
|
||||||
UnreadCount int64 `json:"unread_count"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ListChatsChatData struct {
|
type ListChatsChatData struct {
|
||||||
// Chat identifier
|
// Chat identifier
|
||||||
ChatId string `json:"chat_id"`
|
ChatId string `json:"chat_id"`
|
||||||
@@ -79,6 +65,15 @@ type ListChatsChatData struct {
|
|||||||
|
|
||||||
// Chat creation date
|
// Chat creation date
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
|
||||||
|
// Identifier of the first unread chat message
|
||||||
|
FirstUnreadMessageId uint64 `json:"first_unread_message_id"`
|
||||||
|
|
||||||
|
// Identifier of the last message in the chat
|
||||||
|
LastMessageId uint64 `json:"last_message_id"`
|
||||||
|
|
||||||
|
// Number of unread messages in the chat
|
||||||
|
UnreadCount int64 `json:"unread_count"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns information about chats by specified filters
|
// Returns information about chats by specified filters
|
||||||
@@ -217,7 +212,7 @@ type ChatHistoryMessageUser struct {
|
|||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Chat history
|
// Returns the history of chat messages. By default messages are shown from newest to oldest.
|
||||||
func (c Chats) History(ctx context.Context, params *ChatHistoryParams) (*ChatHistoryResponse, error) {
|
func (c Chats) History(ctx context.Context, params *ChatHistoryParams) (*ChatHistoryResponse, error) {
|
||||||
url := "/v2/chat/history"
|
url := "/v2/chat/history"
|
||||||
|
|
||||||
@@ -240,7 +235,7 @@ type UpdateChatParams struct {
|
|||||||
FromMessageId uint64 `json:"from_message_id"`
|
FromMessageId uint64 `json:"from_message_id"`
|
||||||
|
|
||||||
// Number of messages in the response
|
// Number of messages in the response
|
||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateChatResponse struct {
|
type UpdateChatResponse struct {
|
||||||
@@ -386,7 +381,7 @@ func (c Chats) Create(ctx context.Context, params *CreateNewChatParams) (*Create
|
|||||||
|
|
||||||
type MarkAsReadParams struct {
|
type MarkAsReadParams struct {
|
||||||
// Chat identifier
|
// Chat identifier
|
||||||
Chatid string `json:"chat_id"`
|
ChatId string `json:"chat_id"`
|
||||||
|
|
||||||
// Message identifier
|
// Message identifier
|
||||||
FromMessageId uint64 `json:"from_message_id"`
|
FromMessageId uint64 `json:"from_message_id"`
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ func TestListChats(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"},
|
||||||
&ListChatsParams{
|
&ListChatsParams{
|
||||||
Filter: ListChatsFilter{
|
Filter: &ListChatsFilter{
|
||||||
ChatStatus: "Opened",
|
ChatStatus: "Opened",
|
||||||
UnreadOnly: true,
|
UnreadOnly: true,
|
||||||
},
|
},
|
||||||
@@ -32,15 +32,13 @@ func TestListChats(t *testing.T) {
|
|||||||
`{
|
`{
|
||||||
"chats": [
|
"chats": [
|
||||||
{
|
{
|
||||||
"chat": {
|
|
||||||
"created_at": "2022-07-22T08:07:19.581Z",
|
|
||||||
"chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
|
"chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
|
||||||
"chat_status": "Opened",
|
"chat_status": "Opened",
|
||||||
"chat_type": "Seller_Support"
|
"chat_type": "Seller_Support",
|
||||||
},
|
"created_at": "2022-07-22T08:07:19.581Z",
|
||||||
"first_unread_message_id": "3000000000118021931",
|
"unread_count": 1,
|
||||||
"last_message_id": "30000000001280042740",
|
"last_message_id": 3000000000128004274,
|
||||||
"unread_count": 1
|
"first_unread_message_id": 3000000000118021931
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"total_chats_count": 25,
|
"total_chats_count": 25,
|
||||||
@@ -77,10 +75,10 @@ func TestListChats(t *testing.T) {
|
|||||||
|
|
||||||
if resp.StatusCode == http.StatusOK {
|
if resp.StatusCode == http.StatusOK {
|
||||||
if len(resp.Chats) > 0 {
|
if len(resp.Chats) > 0 {
|
||||||
if resp.Chats[0].Chat.ChatStatus == "" {
|
if resp.Chats[0].ChatStatus == "" {
|
||||||
t.Errorf("Chat status cannot be empty")
|
t.Errorf("Chat status cannot be empty")
|
||||||
}
|
}
|
||||||
if resp.Chats[0].Chat.ChatType == "" {
|
if resp.Chats[0].ChatType == "" {
|
||||||
t.Errorf("Chat type cannot be empty")
|
t.Errorf("Chat type cannot be empty")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -400,7 +398,7 @@ func TestMarkAsRead(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"},
|
||||||
&MarkAsReadParams{
|
&MarkAsReadParams{
|
||||||
Chatid: "99feb3fc-a474-469f-95d5-268b470cc607",
|
ChatId: "99feb3fc-a474-469f-95d5-268b470cc607",
|
||||||
FromMessageId: 3000000000118032000,
|
FromMessageId: 3000000000118032000,
|
||||||
},
|
},
|
||||||
`{
|
`{
|
||||||
|
|||||||
292
ozon/common.go
292
ozon/common.go
@@ -1,6 +1,8 @@
|
|||||||
package ozon
|
package ozon
|
||||||
|
|
||||||
import "time"
|
import (
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
testTimeout = 5 * time.Second
|
testTimeout = 5 * time.Second
|
||||||
@@ -91,16 +93,16 @@ const (
|
|||||||
Purchased ListDiscountRequestsStatus = "PURCHASED"
|
Purchased ListDiscountRequestsStatus = "PURCHASED"
|
||||||
)
|
)
|
||||||
|
|
||||||
type WorkingDay string
|
type WorkingDay int
|
||||||
|
|
||||||
const (
|
const (
|
||||||
Mon WorkingDay = "1"
|
Mon WorkingDay = 1
|
||||||
Tue WorkingDay = "2"
|
Tue WorkingDay = 2
|
||||||
Wed WorkingDay = "3"
|
Wed WorkingDay = 3
|
||||||
Thu WorkingDay = "4"
|
Thu WorkingDay = 4
|
||||||
Fri WorkingDay = "5"
|
Fri WorkingDay = 5
|
||||||
Sat WorkingDay = "6"
|
Sat WorkingDay = 6
|
||||||
Sun WorkingDay = "7"
|
Sun WorkingDay = 7
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetAnalyticsDataDimension string
|
type GetAnalyticsDataDimension string
|
||||||
@@ -124,24 +126,6 @@ const (
|
|||||||
type SupplyRequestState string
|
type SupplyRequestState string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// request draft. Only for supplies via vDC
|
|
||||||
Draft SupplyRequestState = "DRAFT"
|
|
||||||
|
|
||||||
// selecting supply options. Only for supplies via vDC
|
|
||||||
SupplyVariantsArranging SupplyRequestState = "SUPPLY_VARIANTS_ARRANGING"
|
|
||||||
|
|
||||||
// no supply options, the request is archived. Only for supplies via vDC
|
|
||||||
HasNoSupplyVariantsArchive SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_ARCHIVE"
|
|
||||||
|
|
||||||
// no supply options. Only for supplies via vDC
|
|
||||||
HasNoSupplyVariantsNew SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_NEW"
|
|
||||||
|
|
||||||
// supply being approved. Only for supplies via vDC
|
|
||||||
SupplyVariantsConfirmation SupplyRequestState = "SUPPLY_VARIANTS_CONFIRMATION"
|
|
||||||
|
|
||||||
// time reservation
|
|
||||||
TimeslotBooking SupplyRequestState = "TIMESLOT_BOOKING"
|
|
||||||
|
|
||||||
// filling in the data
|
// filling in the data
|
||||||
DATA_FILLING SupplyRequestState = "DATA_FILLING"
|
DATA_FILLING SupplyRequestState = "DATA_FILLING"
|
||||||
|
|
||||||
@@ -312,6 +296,9 @@ const (
|
|||||||
|
|
||||||
// delivery by the seller
|
// delivery by the seller
|
||||||
NonIntegratedTPLType TPLIntegrationType = "non_integrated"
|
NonIntegratedTPLType TPLIntegrationType = "non_integrated"
|
||||||
|
|
||||||
|
// Russian Post delivery scheme
|
||||||
|
HybrydTPLType TPLIntegrationType = "hybryd"
|
||||||
)
|
)
|
||||||
|
|
||||||
type DetailsDeliveryItemName string
|
type DetailsDeliveryItemName string
|
||||||
@@ -458,18 +445,25 @@ const (
|
|||||||
type GetFBSReturnsFilterStatus string
|
type GetFBSReturnsFilterStatus string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
Moving GetFBSReturnsFilterStatus = "moving"
|
||||||
ReturnedToSeller GetFBSReturnsFilterStatus = "returned_to_seller"
|
ReturnedToSeller GetFBSReturnsFilterStatus = "returned_to_seller"
|
||||||
WaitingForSeller GetFBSReturnsFilterStatus = "waiting_for_seller"
|
WaitingForSeller GetFBSReturnsFilterStatus = "waiting_for_seller"
|
||||||
AcceptedFromCustomer GetFBSReturnsFilterStatus = "accepted_from_customer"
|
AcceptedFromCustomer GetFBSReturnsFilterStatus = "accepted_from_customer"
|
||||||
CancelledWithCompensation GetFBSReturnsFilterStatus = "cancelled_with_compensation"
|
CancelledWithCompensation GetFBSReturnsFilterStatus = "cancelled_with_compensation"
|
||||||
ReadyForShipment GetFBSReturnsFilterStatus = "ready_for_shipment"
|
ReadyForShipment GetFBSReturnsFilterStatus = "ready_for_shipment"
|
||||||
|
Disposing GetFBSReturnsFilterStatus = "disposing"
|
||||||
|
Disposed GetFBSReturnsFilterStatus = "disposed"
|
||||||
|
ArrivedForResale GetFBSReturnsFilterStatus = "arrived_for_resale"
|
||||||
|
MovingToResale GetFBSReturnsFilterStatus = "moving_to_resale"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetFBOReturnsFilterStatus string
|
type GetFBOReturnsFilterStatus string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
GetFBOReturnsFilterStatusCreated GetFBOReturnsFilterStatus = "Created"
|
||||||
GetFBOReturnsFilterStatusReturnedToOzon GetFBOReturnsFilterStatus = "ReturnedToOzon"
|
GetFBOReturnsFilterStatusReturnedToOzon GetFBOReturnsFilterStatus = "ReturnedToOzon"
|
||||||
GetFBOReturnsFilterStatusCancelled GetFBOReturnsFilterStatus = "Cancelled"
|
GetFBOReturnsFilterStatusCancelled GetFBOReturnsFilterStatus = "Cancelled"
|
||||||
|
GetFBOReturnsFilterStatusCancelledWithCompensation GetFBOReturnsFilterStatus = "CancelledWithCompensation"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetFBOReturnsReturnStatus string
|
type GetFBOReturnsReturnStatus string
|
||||||
@@ -679,3 +673,247 @@ const (
|
|||||||
// Check is failed
|
// Check is failed
|
||||||
MandatoryMarkStatusFailed MandatoryMarkStatus = "failed"
|
MandatoryMarkStatusFailed MandatoryMarkStatus = "failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type GetCarriageStatus string
|
||||||
|
|
||||||
|
const (
|
||||||
|
// acceptance in progress
|
||||||
|
GetCarriageStatusReceived GetCarriageStatus = "received"
|
||||||
|
|
||||||
|
// closed after acceptance
|
||||||
|
GetCarriageStatusClosed GetCarriageStatus = "closed"
|
||||||
|
|
||||||
|
GetCarriageStatusSended GetCarriageStatus = "sended"
|
||||||
|
|
||||||
|
GetCarriageStatusCancelled GetCarriageStatus = "cancelled"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TransactionOperationService string
|
||||||
|
|
||||||
|
const (
|
||||||
|
// return of unclaimed products from the customer to the warehouse
|
||||||
|
TransactionNotDelivered TransactionOperationService = "MarketplaceNotDeliveredCostItem"
|
||||||
|
|
||||||
|
// return from the customer to the warehouse after delivery
|
||||||
|
TransactionReturnAfterDelivery TransactionOperationService = "TransactionOperationServiceNotDelivered"
|
||||||
|
|
||||||
|
// product delivery to the customer
|
||||||
|
TransactionDelivery TransactionOperationService = "MarketplaceDeliveryCostItem"
|
||||||
|
|
||||||
|
// purchasing reviews on the platform
|
||||||
|
TransactionSaleReviews TransactionOperationService = "MarketplaceSaleReviewsItem"
|
||||||
|
|
||||||
|
// products delivery to the Ozon warehouse (cross docking)
|
||||||
|
TransactionItemAdForSupplierLogistic TransactionOperationService = "ItemAdvertisementForSupplierLogistic"
|
||||||
|
|
||||||
|
// product placement service
|
||||||
|
TransactionServiceStorageItem TransactionOperationService = "OperationMarketplaceServiceStorage"
|
||||||
|
|
||||||
|
// products promotion
|
||||||
|
TransactionMarketingActionCost TransactionOperationService = "MarketplaceMarketingActionCostItem"
|
||||||
|
|
||||||
|
// promotion and selling on an instalment plan
|
||||||
|
TransactionServiceItemInstallment TransactionOperationService = "MarketplaceServiceItemInstallment"
|
||||||
|
|
||||||
|
// mandatory products labeling
|
||||||
|
TransactionServiceMarkingItems TransactionOperationService = "MarketplaceServiceItemMarkingItems"
|
||||||
|
|
||||||
|
// flexible payment schedule
|
||||||
|
TransactionServiceFlexiblePaymentSchedule TransactionOperationService = "MarketplaceServiceItemFlexiblePaymentSchedule"
|
||||||
|
|
||||||
|
// picking up products for removal by the seller
|
||||||
|
TransactionServiceReturnFromStock TransactionOperationService = "MarketplaceServiceItemReturnFromStock"
|
||||||
|
|
||||||
|
TransactionServiceStarsMembership TransactionOperationService = "ItemAgentServiceStarsMembership"
|
||||||
|
|
||||||
|
// forwarding trade
|
||||||
|
TransactionItemAdForSupplierLogisticSeller TransactionOperationService = "ItemAdvertisementForSupplierLogisticSeller"
|
||||||
|
|
||||||
|
// last mile
|
||||||
|
TransactionServiceDeliveryToCustomer TransactionOperationService = "MarketplaceServiceItemDelivToCustomer"
|
||||||
|
|
||||||
|
// pipeline
|
||||||
|
TransactionServiceDirectFlowTrans TransactionOperationService = "MarketplaceServiceItemDirectFlowTrans"
|
||||||
|
|
||||||
|
// shipment processing
|
||||||
|
TransactionServiceDropoffFF TransactionOperationService = "MarketplaceServiceItemDropoffFF"
|
||||||
|
|
||||||
|
// shipment processing
|
||||||
|
TransactionServiceDropoffPVZ TransactionOperationService = "MarketplaceServiceItemDropoffPVZ"
|
||||||
|
|
||||||
|
// shipment processing
|
||||||
|
TransactionServiceDropoffSC TransactionOperationService = "MarketplaceServiceItemDropoffSC"
|
||||||
|
|
||||||
|
// order packaging
|
||||||
|
TransactionServiceFulfillment TransactionOperationService = "MarketplaceServiceItemFulfillment"
|
||||||
|
|
||||||
|
// picking products up by car from the seller's address (Pick-up)
|
||||||
|
TransactionServicePickup TransactionOperationService = "MarketplaceServiceItemPickup"
|
||||||
|
|
||||||
|
// return processing
|
||||||
|
TransactionServiceReturnAfterDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnAfterDelivToCustomer"
|
||||||
|
|
||||||
|
// reverse pipeline
|
||||||
|
TransactionServiceReturnFlowTrans TransactionOperationService = "MarketplaceServiceItemReturnFlowTrans"
|
||||||
|
|
||||||
|
// cancellation processing
|
||||||
|
TransactionServiceReturnNotDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnNotDelivToCustomer"
|
||||||
|
|
||||||
|
// unredeemed order processing
|
||||||
|
TransactionServiceReturnPartGoodsCustomer TransactionOperationService = "MarketplaceServiceItemReturnPartGoodsCustomer"
|
||||||
|
|
||||||
|
// acquiring payment
|
||||||
|
TransactionRedistributionOfAcquiringOperation TransactionOperationService = "MarketplaceRedistributionOfAcquiringOperation"
|
||||||
|
|
||||||
|
// FBS return short-term placement
|
||||||
|
TransactionServiceAtPickupPointFBS TransactionOperationService = "MarketplaceReturnStorageServiceAtThePickupPointFbsItem"
|
||||||
|
|
||||||
|
// FBS return long-term placement
|
||||||
|
TransactionServiceInWarehouseFBS TransactionOperationService = "MarketplaceReturnStorageServiceInTheWarehouseFbsItem"
|
||||||
|
|
||||||
|
// bulky products delivery
|
||||||
|
TransactionServiceDeliveryKGT TransactionOperationService = "MarketplaceServiceItemDeliveryKGT"
|
||||||
|
|
||||||
|
// logistics
|
||||||
|
TransactionServiceDirectFlowLogistic TransactionOperationService = "MarketplaceServiceItemDirectFlowLogistic"
|
||||||
|
|
||||||
|
// reverse logistics
|
||||||
|
TransactionServiceReturnFlowLogistic TransactionOperationService = "MarketplaceServiceItemReturnFlowLogistic"
|
||||||
|
|
||||||
|
// "Seller's Bonus" promotion service
|
||||||
|
TransactionServicePremiumCashbackIndPoints TransactionOperationService = "MarketplaceServicePremiumCashbackIndividualPoints"
|
||||||
|
|
||||||
|
// Premium promotion service, fixed commission
|
||||||
|
TransactionServicePremiumPromotion TransactionOperationService = "MarketplaceServicePremiumPromotion"
|
||||||
|
|
||||||
|
// withholding for product shortage
|
||||||
|
TransactionServiceWithHoldingForUndeliverableGoods TransactionOperationService = "OperationMarketplaceWithHoldingForUndeliverableGoods"
|
||||||
|
|
||||||
|
// drop-off service at the pick-up point
|
||||||
|
TransactionServiceDropoffPPZ TransactionOperationService = "MarketplaceServiceItemDropoffPPZ"
|
||||||
|
|
||||||
|
// reissue of returns at the pick-up point
|
||||||
|
TransactionServiceRedistributionReturnsPVZ TransactionOperationService = "MarketplaceServiceItemRedistributionReturnsPVZ"
|
||||||
|
|
||||||
|
// Agregator 3PL Globalagency service tariffication
|
||||||
|
TransactionServiceAgencyFeeAggregator3PLGlobal TransactionOperationService = "OperationMarketplaceAgencyFeeAggregator3PLGlobal"
|
||||||
|
)
|
||||||
|
|
||||||
|
type PaymentTypeGroupName string
|
||||||
|
|
||||||
|
const (
|
||||||
|
PaymentTypeGroupByCardOnline PaymentTypeGroupName = "by card online"
|
||||||
|
PaymentTypeGroupOzonCard PaymentTypeGroupName = "Ozon Card"
|
||||||
|
PaymentTypeGroupOzonCardAtCheckout PaymentTypeGroupName = "Ozon Card at checkout"
|
||||||
|
PaymentTypeGroupBySavedBankCardUponPickup PaymentTypeGroupName = "by saved bank card upon pick-up"
|
||||||
|
PaymentTypeGroupFasterPaymentSystem PaymentTypeGroupName = "Faster payment system"
|
||||||
|
PaymentTypeGroupOzonInstallment PaymentTypeGroupName = "Ozon Installment"
|
||||||
|
PaymentTypeGroupPaymentToCurrentAccount PaymentTypeGroupName = "payment to current account"
|
||||||
|
PaymentTypeGroupSberpay PaymentTypeGroupName = "Sberpay"
|
||||||
|
)
|
||||||
|
|
||||||
|
type VisualStatus string
|
||||||
|
|
||||||
|
const (
|
||||||
|
// dispute with the customer has been opened
|
||||||
|
VisualStatusDisputeOpened VisualStatus = "DisputeOpened"
|
||||||
|
|
||||||
|
// pending with the seller
|
||||||
|
VisualStatusOnSellerApproval VisualStatus = "OnSellerApproval"
|
||||||
|
|
||||||
|
// at the pick-up point
|
||||||
|
VisualStatusArrivedAtReturnPlace VisualStatus = "ArrivedAtReturnPlace"
|
||||||
|
|
||||||
|
// pending clarification by the seller
|
||||||
|
VisualStatusOnSellerClarification VisualStatus = "OnSellerClarification"
|
||||||
|
|
||||||
|
// pending clarification by the seller after partial compensation
|
||||||
|
VisualStatusOnSellerClarificationPartial VisualStatus = "OnSellerClarificationAfterPartialCompensation"
|
||||||
|
|
||||||
|
// partial compensation offered
|
||||||
|
VisualStatusOfferedPartial VisualStatus = "OfferedPartialCompensation"
|
||||||
|
|
||||||
|
// refund approved
|
||||||
|
VisualStatusReturnMoneyApproved VisualStatus = "ReturnMoneyApproved"
|
||||||
|
|
||||||
|
// partial compensation provided
|
||||||
|
VisualStatusPartialReturned VisualStatus = "PartialCompensationReturned"
|
||||||
|
|
||||||
|
// refund rejected, dispute isn't opened
|
||||||
|
VisualStatusCancelledDisputeNotOpen VisualStatus = "CancelledDisputeNotOpen"
|
||||||
|
|
||||||
|
// request rejected
|
||||||
|
VisualStatusRejected VisualStatus = "Rejected"
|
||||||
|
|
||||||
|
// request rejected by Ozon
|
||||||
|
VisualStatusCrmRejected VisualStatus = "CrmRejected"
|
||||||
|
|
||||||
|
// request canceled
|
||||||
|
VisualStatusCancelled VisualStatus = "Cancelled"
|
||||||
|
|
||||||
|
// request approved by the seller
|
||||||
|
VisualStatusApproved VisualStatus = "Approved"
|
||||||
|
|
||||||
|
// request approved by Ozon
|
||||||
|
VisualStatusApprovedByOzon VisualStatus = "ApprovedByOzon"
|
||||||
|
|
||||||
|
// seller received the return
|
||||||
|
VisualStatusReceivedBySeller VisualStatus = "ReceivedBySeller"
|
||||||
|
|
||||||
|
// return is on its way to the seller
|
||||||
|
VisualStatusMovingToSeller VisualStatus = "MovingToSeller"
|
||||||
|
|
||||||
|
// seller received the refund
|
||||||
|
VisualStatusReturnCompensated VisualStatus = "ReturnCompensated"
|
||||||
|
|
||||||
|
// courier is taking the return to the seller
|
||||||
|
VisualStatusReturningByCourier VisualStatus = "ReturningByCourier"
|
||||||
|
|
||||||
|
// on disposal
|
||||||
|
VisualStatusUtilizing VisualStatus = "Utilizing"
|
||||||
|
|
||||||
|
// disposed of
|
||||||
|
VisualStatusUtilized VisualStatus = "Utilized"
|
||||||
|
|
||||||
|
// customer received full refund
|
||||||
|
VisualStatusMoneyReturned VisualStatus = "MoneyReturned"
|
||||||
|
|
||||||
|
// partial refund has been approved
|
||||||
|
VisualStatusPartialInProcess VisualStatus = "PartialCompensationInProcess"
|
||||||
|
|
||||||
|
// seller opened a dispute
|
||||||
|
VisualStatusDisputeYouOpened VisualStatus = "DisputeYouOpened"
|
||||||
|
|
||||||
|
// compensation rejected
|
||||||
|
VisualStatusCompensationRejected VisualStatus = "CompensationRejected"
|
||||||
|
|
||||||
|
// support request sent
|
||||||
|
VisualStatusDisputeOpening VisualStatus = "DisputeOpening"
|
||||||
|
|
||||||
|
// awaiting your decision on compensation
|
||||||
|
VisualStatusCompensationOffered VisualStatus = "CompensationOffered"
|
||||||
|
|
||||||
|
// awaiting compensation
|
||||||
|
VisualStatusWaitingCompensation VisualStatus = "WaitingCompensation"
|
||||||
|
|
||||||
|
// an error occurred when sending the support request
|
||||||
|
VisualStatusSendingError VisualStatus = "SendingError"
|
||||||
|
|
||||||
|
// decision period has expired
|
||||||
|
VisualStatusCompensationRejectedBySla VisualStatus = "CompensationRejectedBySla"
|
||||||
|
|
||||||
|
// seller has refused compensation
|
||||||
|
VisualStatusCompensationRejectedBySeller VisualStatus = "CompensationRejectedBySeller"
|
||||||
|
|
||||||
|
// on the way to the Ozon warehouse
|
||||||
|
VisualStatusMovingToOzon VisualStatus = "MovingToOzon"
|
||||||
|
|
||||||
|
// arrived at the Ozon warehouse
|
||||||
|
VisualStatusReturnedToOzon VisualStatus = "ReturnedToOzon"
|
||||||
|
|
||||||
|
// quick refund
|
||||||
|
VisualStatusMoneyReturnedBySystem VisualStatus = "MoneyReturnedBySystem"
|
||||||
|
|
||||||
|
// awaiting shipping
|
||||||
|
VisualStatusWaitingShipment VisualStatus = "WaitingShipment"
|
||||||
|
)
|
||||||
|
|||||||
20
ozon/fbo.go
20
ozon/fbo.go
@@ -14,7 +14,7 @@ type FBO struct {
|
|||||||
|
|
||||||
type GetFBOShipmentsListParams struct {
|
type GetFBOShipmentsListParams struct {
|
||||||
// Sorting direction
|
// Sorting direction
|
||||||
Direction string `json:"dir"`
|
Direction Order `json:"dir,omitempty"`
|
||||||
|
|
||||||
// Shipment search filter
|
// Shipment search filter
|
||||||
Filter GetFBOShipmentsListFilter `json:"filter"`
|
Filter GetFBOShipmentsListFilter `json:"filter"`
|
||||||
@@ -23,25 +23,25 @@ type GetFBOShipmentsListParams struct {
|
|||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset int64 `json:"offset"`
|
Offset int64 `json:"offset,omitempty"`
|
||||||
|
|
||||||
// true if the address transliteration from Cyrillic to Latin is enabled
|
// true if the address transliteration from Cyrillic to Latin is enabled
|
||||||
Translit bool `json:"translit"`
|
Translit bool `json:"translit,omitempty"`
|
||||||
|
|
||||||
// Additional fields to add to the response
|
// Additional fields to add to the response
|
||||||
With GetFBOShipmentsListWith `json:"with"`
|
With *GetFBOShipmentsListWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Shipment search filter
|
// Shipment search filter
|
||||||
type GetFBOShipmentsListFilter struct {
|
type GetFBOShipmentsListFilter struct {
|
||||||
// Period start in YYYY-MM-DD format
|
// Period start in YYYY-MM-DD format
|
||||||
Since time.Time `json:"since"`
|
Since *core.TimeFormat `json:"since,omitempty"`
|
||||||
|
|
||||||
// Shipment status
|
// Shipment status
|
||||||
Status string `json:"status"`
|
Status string `json:"status,omitempty"`
|
||||||
|
|
||||||
// Period end in YYYY-MM-DD format
|
// Period end in YYYY-MM-DD format
|
||||||
To time.Time `json:"to"`
|
To *core.TimeFormat `json:"to,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Additional fields to add to the response
|
// Additional fields to add to the response
|
||||||
@@ -116,7 +116,7 @@ type GetFBOShipmentsListResultAnalyticsData struct {
|
|||||||
IsPremium bool `json:"is_premium"`
|
IsPremium bool `json:"is_premium"`
|
||||||
|
|
||||||
// Payment method
|
// Payment method
|
||||||
PaymentTypeGroupName string `json:"payment_type_group_name"`
|
PaymentTypeGroupName PaymentTypeGroupName `json:"payment_type_group_name"`
|
||||||
|
|
||||||
// Delivery region
|
// Delivery region
|
||||||
Region string `json:"region"`
|
Region string `json:"region"`
|
||||||
@@ -185,10 +185,10 @@ type GetShipmentDetailsParams struct {
|
|||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
// true if the address transliteration from Cyrillic to Latin is enabled
|
// true if the address transliteration from Cyrillic to Latin is enabled
|
||||||
Translit bool `json:"translit"`
|
Translit bool `json:"translit,omitempty"`
|
||||||
|
|
||||||
// Additional fields to add to the response
|
// Additional fields to add to the response
|
||||||
With GetShipmentDetailsWith `json:"with"`
|
With *GetShipmentDetailsWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetShipmentDetailsWith struct {
|
type GetShipmentDetailsWith struct {
|
||||||
|
|||||||
@@ -24,14 +24,14 @@ func TestGetFBOShipmentsList(t *testing.T) {
|
|||||||
&GetFBOShipmentsListParams{
|
&GetFBOShipmentsListParams{
|
||||||
Direction: "ASC",
|
Direction: "ASC",
|
||||||
Filter: GetFBOShipmentsListFilter{
|
Filter: GetFBOShipmentsListFilter{
|
||||||
Since: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-01T00:00:00.000Z"),
|
Since: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-01T00:00:00.000Z"), "2006-01-02T15:04:05Z"),
|
||||||
Status: "awaiting_packaging",
|
Status: "awaiting_packaging",
|
||||||
To: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-17T10:44:12.828Z"),
|
To: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-17T10:44:12.828Z"), "2006-01-02T15:04:05Z"),
|
||||||
},
|
},
|
||||||
Limit: 5,
|
Limit: 5,
|
||||||
Offset: 0,
|
Offset: 0,
|
||||||
Translit: true,
|
Translit: true,
|
||||||
With: GetFBOShipmentsListWith{
|
With: &GetFBOShipmentsListWith{
|
||||||
AnalyticsData: true,
|
AnalyticsData: true,
|
||||||
FinancialData: true,
|
FinancialData: true,
|
||||||
},
|
},
|
||||||
@@ -165,7 +165,7 @@ func TestGetShipmentDetails(t *testing.T) {
|
|||||||
&GetShipmentDetailsParams{
|
&GetShipmentDetailsParams{
|
||||||
PostingNumber: "50520644-0012-7",
|
PostingNumber: "50520644-0012-7",
|
||||||
Translit: true,
|
Translit: true,
|
||||||
With: GetShipmentDetailsWith{
|
With: &GetShipmentDetailsWith{
|
||||||
AnalyticsData: true,
|
AnalyticsData: true,
|
||||||
FinancialData: true,
|
FinancialData: true,
|
||||||
},
|
},
|
||||||
|
|||||||
324
ozon/fbs.go
324
ozon/fbs.go
@@ -14,7 +14,7 @@ type FBS struct {
|
|||||||
|
|
||||||
type ListUnprocessedShipmentsParams struct {
|
type ListUnprocessedShipmentsParams struct {
|
||||||
// Sorting direction
|
// Sorting direction
|
||||||
Direction Order `json:"dir"`
|
Direction Order `json:"dir,omitempty"`
|
||||||
|
|
||||||
// Request filter
|
// Request filter
|
||||||
Filter ListUnprocessedShipmentsFilter `json:"filter"`
|
Filter ListUnprocessedShipmentsFilter `json:"filter"`
|
||||||
@@ -27,28 +27,28 @@ type ListUnprocessedShipmentsParams struct {
|
|||||||
|
|
||||||
// Number of elements that will be skipped in the response.
|
// Number of elements that will be skipped in the response.
|
||||||
// For example, if `offset` = 10, the response will start with the 11th element found
|
// For example, if `offset` = 10, the response will start with the 11th element found
|
||||||
Offset int64 `json:"offset"`
|
Offset int64 `json:"offset,omitempty"`
|
||||||
|
|
||||||
// Additional fields that should be added to the response
|
// Additional fields that should be added to the response
|
||||||
With ListUnprocessedShipmentsWith `json:"with"`
|
With *ListUnprocessedShipmentsWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListUnprocessedShipmentsFilter struct {
|
type ListUnprocessedShipmentsFilter struct {
|
||||||
// Filter by the time by which the seller should pack the order. Period start.
|
// Filter by the time by which the seller should pack the order. Period start.
|
||||||
//
|
//
|
||||||
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
||||||
CutoffFrom time.Time `json:"cutoff_from"`
|
CutoffFrom *core.TimeFormat `json:"cutoff_from,omitempty"`
|
||||||
|
|
||||||
// Filter by the time by which the seller should pack the order. Period end.
|
// Filter by the time by which the seller should pack the order. Period end.
|
||||||
//
|
//
|
||||||
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
||||||
CutoffTo time.Time `json:"cutoff_to"`
|
CutoffTo *core.TimeFormat `json:"cutoff_to,omitempty"`
|
||||||
|
|
||||||
// Minimum date when shipment should be handed over for delivery
|
// Minimum date when shipment should be handed over for delivery
|
||||||
DeliveringDateFrom time.Time `json:"delivering_date_from"`
|
DeliveringDateFrom *core.TimeFormat `json:"delivering_date_from,omitempty"`
|
||||||
|
|
||||||
// Maximum date when shipment should be handed over for delivery
|
// Maximum date when shipment should be handed over for delivery
|
||||||
DeliveringDateTo time.Time `json:"delivering_date_to"`
|
DeliveringDateTo *core.TimeFormat `json:"delivering_date_to,omitempty"`
|
||||||
|
|
||||||
// Delivery method identifier
|
// Delivery method identifier
|
||||||
DeliveryMethodId []int64 `json:"delivery_method_id"`
|
DeliveryMethodId []int64 `json:"delivery_method_id"`
|
||||||
@@ -58,7 +58,7 @@ type ListUnprocessedShipmentsFilter struct {
|
|||||||
// Default value is all.
|
// Default value is all.
|
||||||
//
|
//
|
||||||
// The FBP scheme is available only for sellers from China
|
// The FBP scheme is available only for sellers from China
|
||||||
FBPFilter FBPFilter `json:"fbpFilter"`
|
FBPFilter FBPFilter `json:"fbpFilter" default:"all"`
|
||||||
|
|
||||||
// Delivery service identifier
|
// Delivery service identifier
|
||||||
ProviderId []int64 `json:"provider_id"`
|
ProviderId []int64 `json:"provider_id"`
|
||||||
@@ -106,6 +106,9 @@ type FBSPosting struct {
|
|||||||
// Analytics data
|
// Analytics data
|
||||||
AnalyticsData FBSPostingAnalyticsData `json:"analytics_data"`
|
AnalyticsData FBSPostingAnalyticsData `json:"analytics_data"`
|
||||||
|
|
||||||
|
// Available actions and shipment information
|
||||||
|
AvailableActions []string `json:"available_actions"`
|
||||||
|
|
||||||
// Shipment barcodes
|
// Shipment barcodes
|
||||||
Barcodes FBSBarcode `json:"barcodes"`
|
Barcodes FBSBarcode `json:"barcodes"`
|
||||||
|
|
||||||
@@ -174,7 +177,7 @@ type FBSPosting struct {
|
|||||||
Substatus string `json:"substatus"`
|
Substatus string `json:"substatus"`
|
||||||
|
|
||||||
// Type of integration with the delivery service
|
// Type of integration with the delivery service
|
||||||
TPLIntegrationType string `json:"tpl_integration_type"`
|
TPLIntegrationType TPLIntegrationType `json:"tpl_integration_type"`
|
||||||
|
|
||||||
// Shipment tracking number
|
// Shipment tracking number
|
||||||
TrackingNumber string `json:"tracking_number"`
|
TrackingNumber string `json:"tracking_number"`
|
||||||
@@ -213,7 +216,7 @@ type FBSPostingAnalyticsData struct {
|
|||||||
IsPremium bool `json:"is_premium"`
|
IsPremium bool `json:"is_premium"`
|
||||||
|
|
||||||
// Payment method
|
// Payment method
|
||||||
PaymentTypeGroupName string `json:"payment_type_group_name"`
|
PaymentTypeGroupName PaymentTypeGroupName `json:"payment_type_group_name"`
|
||||||
|
|
||||||
// Delivery region
|
// Delivery region
|
||||||
Region string `json:"region"`
|
Region string `json:"region"`
|
||||||
@@ -350,9 +353,6 @@ type FBSCustomer struct {
|
|||||||
// Delivery address details
|
// Delivery address details
|
||||||
Address FBSCustomerAddress `json:"address"`
|
Address FBSCustomerAddress `json:"address"`
|
||||||
|
|
||||||
// Customer e-mail
|
|
||||||
CustomerEmail string `json:"customer_email"`
|
|
||||||
|
|
||||||
// Customer identifier
|
// Customer identifier
|
||||||
CustomerId int64 `json:"customer_id"`
|
CustomerId int64 `json:"customer_id"`
|
||||||
|
|
||||||
@@ -361,7 +361,7 @@ type FBSCustomer struct {
|
|||||||
|
|
||||||
// Customer phone number.
|
// Customer phone number.
|
||||||
//
|
//
|
||||||
// Returns an empty string
|
// Returns an empty string ""
|
||||||
Phone string `json:"phone"`
|
Phone string `json:"phone"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,6 +452,8 @@ type FinancialDataProduct struct {
|
|||||||
CommissionsCurrencyCode string `json:"commissions_currency_code"`
|
CommissionsCurrencyCode string `json:"commissions_currency_code"`
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
|
//
|
||||||
|
// Deprecated: The parameter is outdated. To get information on accruals, use the `ListTransactions` method
|
||||||
ItemServices MarketplaceServices `json:"item_services"`
|
ItemServices MarketplaceServices `json:"item_services"`
|
||||||
|
|
||||||
// Currency of your prices. It matches the currency set in the personal account settings
|
// Currency of your prices. It matches the currency set in the personal account settings
|
||||||
@@ -511,9 +513,9 @@ func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocess
|
|||||||
|
|
||||||
type GetFBSShipmentsListParams struct {
|
type GetFBSShipmentsListParams struct {
|
||||||
// Sorting direction
|
// Sorting direction
|
||||||
Direction string `json:"direction"`
|
Direction Order `json:"dir,omitempty"`
|
||||||
|
|
||||||
//Filter
|
// Filter
|
||||||
Filter GetFBSShipmentsListFilter `json:"filter"`
|
Filter GetFBSShipmentsListFilter `json:"filter"`
|
||||||
|
|
||||||
// Number of shipments in the response:
|
// Number of shipments in the response:
|
||||||
@@ -522,22 +524,22 @@ type GetFBSShipmentsListParams struct {
|
|||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset int64 `json:"offset"`
|
Offset int64 `json:"offset,omitempty"`
|
||||||
|
|
||||||
// Additional fields that should be added to the response
|
// Additional fields that should be added to the response
|
||||||
With GetFBSShipmentsListWith `json:"with"`
|
With *GetFBSShipmentsListWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetFBSShipmentsListFilter struct {
|
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:
|
// Filter for shipments delivered from partner warehouse (FBP)
|
||||||
//
|
//
|
||||||
// Default value is all.
|
// Default value is all.
|
||||||
//
|
//
|
||||||
// The FBP scheme is available only for sellers from China
|
// The FBP scheme is available only for sellers from China
|
||||||
FBPFilter FBPFilter `json:"fbpFilter"`
|
FBPFilter FBPFilter `json:"fbpFilter" default:"all"`
|
||||||
|
|
||||||
// Order identifier
|
// Order identifier
|
||||||
OrderId int64 `json:"order_id"`
|
OrderId int64 `json:"order_id"`
|
||||||
@@ -564,6 +566,13 @@ type GetFBSShipmentsListFilter struct {
|
|||||||
|
|
||||||
// Warehouse identifier
|
// Warehouse identifier
|
||||||
WarehouseId []int64 `json:"warehouse_id"`
|
WarehouseId []int64 `json:"warehouse_id"`
|
||||||
|
|
||||||
|
LastChangedStatusDate GetFBSShipmentsListFilterLastChangeDate `json:"last_changed_status_date"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSShipmentsListFilterLastChangeDate struct {
|
||||||
|
From time.Time `json:"from"`
|
||||||
|
To time.Time `json:"to"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetFBSShipmentsListWith struct {
|
type GetFBSShipmentsListWith struct {
|
||||||
@@ -625,7 +634,7 @@ type PackOrderParams struct {
|
|||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
// Additional information
|
// Additional information
|
||||||
With PackOrderWith `json:"with"`
|
With *PackOrderWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type PackOrderPackage struct {
|
type PackOrderPackage struct {
|
||||||
@@ -865,7 +874,7 @@ type GetShipmentDataByIdentifierParams struct {
|
|||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
// Additional fields that should be added to the response
|
// Additional fields that should be added to the response
|
||||||
With GetShipmentDataByIdentifierWith `json:"with"`
|
With *GetShipmentDataByIdentifierWith `json:"with,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetShipmentDataByIdentifierWith struct {
|
type GetShipmentDataByIdentifierWith struct {
|
||||||
@@ -906,6 +915,9 @@ type GetShipmentDataByIdentifierResult struct {
|
|||||||
// Analytics data
|
// Analytics data
|
||||||
AnalyticsData GetShipmentDataByIdentifierResultAnalyticsData `json:"analytics_data"`
|
AnalyticsData GetShipmentDataByIdentifierResultAnalyticsData `json:"analytics_data"`
|
||||||
|
|
||||||
|
// Available actions and shipment information
|
||||||
|
AvailableActions []string `json:"available_actions"`
|
||||||
|
|
||||||
// Shipment barcodes
|
// Shipment barcodes
|
||||||
Barcodes FBSBarcode `json:"barcodes"`
|
Barcodes FBSBarcode `json:"barcodes"`
|
||||||
|
|
||||||
@@ -1007,7 +1019,9 @@ type GetShipmentDataByIdentifierResultAddressee struct {
|
|||||||
// Recipient name
|
// Recipient name
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
|
||||||
// Recipient phone number
|
// Recipient phone number.
|
||||||
|
//
|
||||||
|
// Returns an empty string ""
|
||||||
Phone string `json:"phone"`
|
Phone string `json:"phone"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1062,6 +1076,8 @@ type GetShipmentDataByIdentifierResultCourier struct {
|
|||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
|
||||||
// Courier's phone number
|
// Courier's phone number
|
||||||
|
//
|
||||||
|
// Returns an empty string ""
|
||||||
Phone string `json:"phone"`
|
Phone string `json:"phone"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1672,15 +1688,25 @@ type CreateTaskForGeneratingLabelResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type CreateTaskForGeneratingLabelResult struct {
|
type CreateTaskForGeneratingLabelResult struct {
|
||||||
|
Tasks []CreateTaskForGeneratingLabelTask `json:"tasks"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateTaskForGeneratingLabelTask struct {
|
||||||
// Task identifier for labeling generation
|
// Task identifier for labeling generation
|
||||||
TaskId int64 `json:"task_id"`
|
TaskId int64 `json:"task_id"`
|
||||||
|
|
||||||
|
// Type of label generation task:
|
||||||
|
//
|
||||||
|
// big_label — for a regular label,
|
||||||
|
// small_label — for a small label
|
||||||
|
TaskType string `json:"task_type"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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(ctx context.Context, params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
|
func (c FBS) CreateTaskForGeneratingLabel(ctx context.Context, params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
|
||||||
url := "/v1/posting/fbs/package-label/create"
|
url := "/v2/posting/fbs/package-label/create"
|
||||||
|
|
||||||
resp := &CreateTaskForGeneratingLabelResponse{}
|
resp := &CreateTaskForGeneratingLabelResponse{}
|
||||||
|
|
||||||
@@ -1833,22 +1859,35 @@ type CheckProductItemsDataResponse struct {
|
|||||||
//
|
//
|
||||||
// for checking the availability of product items in the “Chestny ZNAK” labeling system;
|
// for checking the availability of product items in the “Chestny ZNAK” labeling system;
|
||||||
// for saving product items data.
|
// for saving product items data.
|
||||||
// To get the checks results, use the `/v4/fbs/posting/product/exemplar/status` method.
|
|
||||||
// To get data about created items, use the `/v5/fbs/fbs/posting/product/exemplar/create-or-get` method.
|
|
||||||
//
|
//
|
||||||
// If necessary, specify the number of the cargo customs declaration in the gtd parameter.
|
// To get the checks results,
|
||||||
// If it is missing, pass the value `is_gtd_absent` = true.
|
// use the /v4/fbs/posting/product/exemplar/status method.
|
||||||
|
// To get data about created items,
|
||||||
|
// use the /v5/fbs/fbs/posting/product/exemplar/create-or-get method.
|
||||||
//
|
//
|
||||||
// If you have multiple identical products in a shipment, specify one `product_id` and exemplars array for each product in the shipment.
|
// If necessary, specify the number of the cargo customs declaration
|
||||||
|
// in the gtd parameter. If it is missing,
|
||||||
|
// pass the value is_gtd_absent = true.
|
||||||
|
//
|
||||||
|
// If you have multiple identical products in a shipment,
|
||||||
|
// specify one product_id and exemplars array for each product in the shipment.
|
||||||
//
|
//
|
||||||
// Always pass a complete set of product items data.
|
// Always pass a complete set of product items data.
|
||||||
//
|
//
|
||||||
// For example, you have 10 product items in your system.
|
// For example, you have 10 product items in your system.
|
||||||
// You've passed them for checking and saving.
|
// You've passed them for checking and saving.
|
||||||
// Then you added another 60 product items to your system.
|
// Then you added another 60 product items to your system.
|
||||||
// When you pass product items for checking and saving again, pass all of them: both old and newly added.
|
// When you pass product items for checking and saving again,
|
||||||
|
// pass all of them: both old and newly added.
|
||||||
|
//
|
||||||
|
// Unlike /v4/fbs/posting/product/exemplar/set,
|
||||||
|
// you can pass more item information in the request.
|
||||||
|
//
|
||||||
|
// The 200 response code doesn't guarantee that instance data has been received.
|
||||||
|
// It indicates that a task for adding the information has been created.
|
||||||
|
// To check the task status, use the /v4/fbs/posting/product/exemplar/status method.
|
||||||
func (c FBS) CheckProductItemsData(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
|
func (c FBS) CheckProductItemsData(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
|
||||||
url := "/v4/fbs/posting/product/exemplar/set"
|
url := "/v5/fbs/posting/product/exemplar/set"
|
||||||
|
|
||||||
resp := &CheckProductItemsDataResponse{}
|
resp := &CheckProductItemsDataResponse{}
|
||||||
|
|
||||||
@@ -2082,10 +2121,16 @@ type PartialPackOrderAdditionalData struct {
|
|||||||
Products []PostingProduct `json:"products"`
|
Products []PostingProduct `json:"products"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// If you pass to the request a part of the products from the shipment, the primary shipment will split into two parts.
|
// If you pass some of the shipped products through the request,
|
||||||
// The primary unassembled shipment will contain some of the products that were not passed to the request.
|
// the primary shipment will split into two parts.
|
||||||
|
// The primary unassembled shipment will contain some of the products
|
||||||
|
// that weren't passed to the request.
|
||||||
//
|
//
|
||||||
// The status of the original shipment will only change when the split shipments status changes
|
// Default status of created shipments is awaiting_packaging,
|
||||||
|
// which indicates that the shipment is awaiting assembly.
|
||||||
|
//
|
||||||
|
// The status of the original shipment will only change
|
||||||
|
// when the split shipments status changes
|
||||||
func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
|
func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
|
||||||
url := "/v4/posting/fbs/ship/package"
|
url := "/v4/posting/fbs/ship/package"
|
||||||
|
|
||||||
@@ -2869,6 +2914,8 @@ type CreateOrGetProductExemplarResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Method returns the created items data passed in the `/v5/fbs/posting/product/exemplar/set` method.
|
// Method returns the created items data passed in the `/v5/fbs/posting/product/exemplar/set` method.
|
||||||
|
//
|
||||||
|
// Use this method to get the `exemplar_id`
|
||||||
func (c FBS) CreateOrGetProductExemplar(ctx context.Context, params *CreateOrGetProductExemplarParams) (*CreateOrGetProductExemplarResponse, error) {
|
func (c FBS) CreateOrGetProductExemplar(ctx context.Context, params *CreateOrGetProductExemplarParams) (*CreateOrGetProductExemplarResponse, error) {
|
||||||
url := "/v5/fbs/posting/product/exemplar/create-or-get"
|
url := "/v5/fbs/posting/product/exemplar/create-or-get"
|
||||||
|
|
||||||
@@ -2882,3 +2929,212 @@ func (c FBS) CreateOrGetProductExemplar(ctx context.Context, params *CreateOrGet
|
|||||||
|
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type GetCarriageParams struct {
|
||||||
|
CarriageId int64 `json:"carriage_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetCarriageResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Acceptance certificate type for FBS sellers
|
||||||
|
ActType string `json:"act_type"`
|
||||||
|
|
||||||
|
// Pass identifiers for the freight
|
||||||
|
ArrivalPassIds []string `json:"arrival_pass_ids"`
|
||||||
|
|
||||||
|
// List of available actions on the freight
|
||||||
|
AvailableActions []string `json:"available_actions"`
|
||||||
|
|
||||||
|
// Cancel availability
|
||||||
|
CancelAvailability GetCarriageCancelAvailability `json:"cancel_availability"`
|
||||||
|
|
||||||
|
// Freight identifier
|
||||||
|
CarriageId int64 `json:"carriage_id"`
|
||||||
|
|
||||||
|
// Company identifier
|
||||||
|
CompanyId int64 `json:"company_id"`
|
||||||
|
|
||||||
|
// Number of package units
|
||||||
|
ContainersCount int32 `json:"containers_count"`
|
||||||
|
|
||||||
|
// Date and time of freight creation
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
|
||||||
|
// Delivery method identifier
|
||||||
|
DeliveryMethodId int64 `json:"delivery_method_id"`
|
||||||
|
|
||||||
|
// Shipping date
|
||||||
|
DepartureDate string `json:"departure_date"`
|
||||||
|
|
||||||
|
// First mile type
|
||||||
|
FirstMileType string `json:"first_mile_type"`
|
||||||
|
|
||||||
|
// true if there are shipments subject to shipping that are not in the current freight
|
||||||
|
HasPostingsForNextCarriage bool `json:"has_postings_for_next_carriage"`
|
||||||
|
|
||||||
|
// Delivery service integration type
|
||||||
|
IntegrationType string `json:"integration_type"`
|
||||||
|
|
||||||
|
// true if you already printed shipping labels
|
||||||
|
IsContainerLabelPrinted bool `json:"is_container_label_printed"`
|
||||||
|
|
||||||
|
// true if the freight is partial
|
||||||
|
IsPartial bool `json:"is_partial"`
|
||||||
|
|
||||||
|
// Serial number of the partial freight
|
||||||
|
PartialNum int64 `json:"partial_num"`
|
||||||
|
|
||||||
|
// The number of retries to create a freight
|
||||||
|
RetryCount int32 `json:"retry_count"`
|
||||||
|
|
||||||
|
// Freight status
|
||||||
|
Status GetCarriageStatus `json:"status"`
|
||||||
|
|
||||||
|
// Delivery method identifier
|
||||||
|
TPLProviderId int64 `json:"tpl_provider_id"`
|
||||||
|
|
||||||
|
// Date and time when the freight was last updated
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
|
||||||
|
// Warehouse identifier
|
||||||
|
WarehouseId int64 `json:"warehouse_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetCarriageCancelAvailability struct {
|
||||||
|
// true if the freight can be cancelled
|
||||||
|
IsCancelAvailable bool `json:"is_cancel_available"`
|
||||||
|
|
||||||
|
// Reason why freight can't be cancelled
|
||||||
|
Reason string `json:"reason"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c FBS) GetCarriage(ctx context.Context, params *GetCarriageParams) (*GetCarriageResponse, error) {
|
||||||
|
url := "/v1/carriage/get"
|
||||||
|
|
||||||
|
resp := &GetCarriageResponse{}
|
||||||
|
|
||||||
|
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 GetCancellationReasonsResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Method result
|
||||||
|
Result []GetCancellationReasonsResult `json:"result"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetCancellationReasonsResult struct {
|
||||||
|
// Cancellation reasons identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
|
// Shipment cancellation result. true if the request is available for cancellation
|
||||||
|
IsAvailableForCancellation bool `json:"is_available_for_cancellation"`
|
||||||
|
|
||||||
|
// Category name
|
||||||
|
Title string `json:"title"`
|
||||||
|
|
||||||
|
// Shipment cancellation initiator
|
||||||
|
TypeId string `json:"type_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c FBS) GetCancellationReasons(ctx context.Context) (*GetCancellationReasonsResponse, error) {
|
||||||
|
url := "/v1/posting/fbo/cancel-reason/list"
|
||||||
|
|
||||||
|
resp := &GetCancellationReasonsResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type SetShippingDateParams struct {
|
||||||
|
// New shipping date
|
||||||
|
NewCutoffDate time.Time `json:"new_cutoff_date"`
|
||||||
|
|
||||||
|
// Shipment number
|
||||||
|
PostingNumber string `json:"posting_number"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SetShippingDateResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// true if the new date is set
|
||||||
|
Result bool `json:"result"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c FBS) SetShippingDate(ctx context.Context, params *SetShippingDateParams) (*SetShippingDateResponse, error) {
|
||||||
|
url := "/v1/posting/cutoff/set"
|
||||||
|
|
||||||
|
resp := &SetShippingDateResponse{}
|
||||||
|
|
||||||
|
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 SplitOrderParams struct {
|
||||||
|
// Shipment number
|
||||||
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
|
// Shipments list the order will be split into. You can split one order per one request
|
||||||
|
Postings []SplitOrderParamPosting `json:"postings"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SplitOrderParamPosting struct {
|
||||||
|
Products []SplitOrderPostingProduct `json:"products"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SplitOrderResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Original shipment details
|
||||||
|
ParentPosting SplitOrderPosting `json:"parent_posting"`
|
||||||
|
|
||||||
|
// List of shipments the order was split into
|
||||||
|
Postings []SplitOrderPosting `json:"postings"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SplitOrderPosting struct {
|
||||||
|
// Shipment number
|
||||||
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
|
// List of products in the shipment
|
||||||
|
Products []SplitOrderPostingProduct `json:"products"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SplitOrderPostingProduct struct {
|
||||||
|
// FBS product identifier in the Ozon system, SKU
|
||||||
|
ProductId int64 `json:"product_id"`
|
||||||
|
|
||||||
|
// Product quantity
|
||||||
|
Quantity int64 `json:"quantity"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c FBS) SplitOrder(ctx context.Context, params *SplitOrderParams) (*SplitOrderResponse, error) {
|
||||||
|
url := "/v1/posting/fbs/split"
|
||||||
|
|
||||||
|
resp := &SplitOrderResponse{}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|||||||
306
ozon/fbs_test.go
306
ozon/fbs_test.go
@@ -24,12 +24,12 @@ func TestListUnprocessedShipments(t *testing.T) {
|
|||||||
&ListUnprocessedShipmentsParams{
|
&ListUnprocessedShipmentsParams{
|
||||||
Direction: "ASC",
|
Direction: "ASC",
|
||||||
Filter: ListUnprocessedShipmentsFilter{
|
Filter: ListUnprocessedShipmentsFilter{
|
||||||
CutoffFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-24T14:15:22Z"),
|
CutoffFrom: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-24T14:15:22Z"), "2006-01-02T15:04:05Z"),
|
||||||
CutoffTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-31T14:15:22Z"),
|
CutoffTo: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-31T14:15:22Z"), "2006-01-02T15:04:05Z"),
|
||||||
Status: "awaiting_packaging",
|
Status: "awaiting_packaging",
|
||||||
},
|
},
|
||||||
Limit: 100,
|
Limit: 100,
|
||||||
With: ListUnprocessedShipmentsWith{
|
With: &ListUnprocessedShipmentsWith{
|
||||||
AnalyticsData: true,
|
AnalyticsData: true,
|
||||||
Barcodes: true,
|
Barcodes: true,
|
||||||
FinancialData: true,
|
FinancialData: true,
|
||||||
@@ -210,7 +210,7 @@ func TestGetFBSShipmentsList(t *testing.T) {
|
|||||||
},
|
},
|
||||||
Limit: 0,
|
Limit: 0,
|
||||||
Offset: 0,
|
Offset: 0,
|
||||||
With: GetFBSShipmentsListWith{
|
With: &GetFBSShipmentsListWith{
|
||||||
AnalyticsData: true,
|
AnalyticsData: true,
|
||||||
FinancialData: true,
|
FinancialData: true,
|
||||||
Translit: true,
|
Translit: true,
|
||||||
@@ -330,7 +330,7 @@ func TestPackOrder(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
PostingNumber: "89491381-0072-1",
|
PostingNumber: "89491381-0072-1",
|
||||||
With: PackOrderWith{
|
With: &PackOrderWith{
|
||||||
AdditionalData: true,
|
AdditionalData: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -556,7 +556,7 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
|
|||||||
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"},
|
||||||
&GetShipmentDataByIdentifierParams{
|
&GetShipmentDataByIdentifierParams{
|
||||||
PostingNumber: "57195475-0050-3",
|
PostingNumber: "57195475-0050-3",
|
||||||
With: GetShipmentDataByIdentifierWith{},
|
With: &GetShipmentDataByIdentifierWith{},
|
||||||
},
|
},
|
||||||
`{
|
`{
|
||||||
"result": {
|
"result": {
|
||||||
@@ -564,6 +564,7 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
|
|||||||
"order_id": 438764970,
|
"order_id": 438764970,
|
||||||
"order_number": "57195475-0050",
|
"order_number": "57195475-0050",
|
||||||
"status": "awaiting_packaging",
|
"status": "awaiting_packaging",
|
||||||
|
"substatus": "posting_awaiting_passport_data",
|
||||||
"delivery_method": {
|
"delivery_method": {
|
||||||
"id": 18114520187000,
|
"id": 18114520187000,
|
||||||
"name": "Ozon Логистика самостоятельно, Москва",
|
"name": "Ozon Логистика самостоятельно, Москва",
|
||||||
@@ -1278,7 +1279,16 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
|
|||||||
},
|
},
|
||||||
`{
|
`{
|
||||||
"result": {
|
"result": {
|
||||||
"task_id": 5819327210249
|
"tasks": [
|
||||||
|
{
|
||||||
|
"task_id": 5819327210248,
|
||||||
|
"task_type": "big_label"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"task_id": 5819327210249,
|
||||||
|
"task_type": "small_label"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}`,
|
}`,
|
||||||
},
|
},
|
||||||
@@ -1310,7 +1320,7 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
|
|||||||
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 resp.StatusCode == http.StatusOK {
|
||||||
if resp.Result.TaskId == 0 {
|
if len(resp.Result.Tasks) != 0 && resp.Result.Tasks[0].TaskId == 0 {
|
||||||
t.Errorf("Task id cannot be 0")
|
t.Errorf("Task id cannot be 0")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2919,3 +2929,283 @@ func TestCreateOrGetProductExemplar(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetCarriage(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *GetCarriageParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&GetCarriageParams{
|
||||||
|
CarriageId: 15,
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"act_type": "string",
|
||||||
|
"arrival_pass_ids": [
|
||||||
|
"string"
|
||||||
|
],
|
||||||
|
"available_actions": [
|
||||||
|
"string"
|
||||||
|
],
|
||||||
|
"cancel_availability": {
|
||||||
|
"is_cancel_available": true,
|
||||||
|
"reason": "string"
|
||||||
|
},
|
||||||
|
"carriage_id": 15,
|
||||||
|
"company_id": 0,
|
||||||
|
"containers_count": 0,
|
||||||
|
"created_at": "2019-08-24T14:15:22Z",
|
||||||
|
"delivery_method_id": 0,
|
||||||
|
"departure_date": "string",
|
||||||
|
"first_mile_type": "string",
|
||||||
|
"has_postings_for_next_carriage": true,
|
||||||
|
"integration_type": "string",
|
||||||
|
"is_container_label_printed": true,
|
||||||
|
"is_partial": true,
|
||||||
|
"partial_num": 0,
|
||||||
|
"retry_count": 0,
|
||||||
|
"status": "string",
|
||||||
|
"tpl_provider_id": 0,
|
||||||
|
"updated_at": "2019-08-24T14:15:22Z",
|
||||||
|
"warehouse_id": 0
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&GetCarriageParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.FBS().GetCarriage(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &GetCarriageResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.CarriageId != test.params.CarriageId {
|
||||||
|
t.Errorf("carriage id in request and response should be equal")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetCancellationReasons(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
`{
|
||||||
|
"result": [
|
||||||
|
{
|
||||||
|
"id": 352,
|
||||||
|
"title": "The products ran out at the seller's warehouse",
|
||||||
|
"type_id": "seller",
|
||||||
|
"is_available_for_cancellation": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 401,
|
||||||
|
"title": "Seller rejects arbitration",
|
||||||
|
"type_id": "seller",
|
||||||
|
"is_available_for_cancellation": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 402,
|
||||||
|
"title": "Other (seller's fault)",
|
||||||
|
"type_id": "seller",
|
||||||
|
"is_available_for_cancellation": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 666,
|
||||||
|
"title": "Return from the delivery service: there is no delivery to the specified region",
|
||||||
|
"type_id": "seller",
|
||||||
|
"is_available_for_cancellation": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.FBS().GetCancellationReasons(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &GetCancellationReasonsResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetShippingDate(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *SetShippingDateParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&SetShippingDateParams{
|
||||||
|
NewCutoffDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"result": true
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&SetShippingDateParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.FBS().SetShippingDate(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &SetShippingDateResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSplitOrder(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *SplitOrderParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&SplitOrderParams{
|
||||||
|
PostingNumber: "string",
|
||||||
|
Postings: []SplitOrderParamPosting{
|
||||||
|
{
|
||||||
|
Products: []SplitOrderPostingProduct{
|
||||||
|
{
|
||||||
|
ProductId: 1,
|
||||||
|
Quantity: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"parent_posting": {
|
||||||
|
"posting_number": "string",
|
||||||
|
"products": [
|
||||||
|
{
|
||||||
|
"product_id": 0,
|
||||||
|
"quantity": 0
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"postings": [
|
||||||
|
{
|
||||||
|
"posting_number": "string",
|
||||||
|
"products": [
|
||||||
|
{
|
||||||
|
"product_id": 0,
|
||||||
|
"quantity": 0
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&SplitOrderParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.FBS().SplitOrder(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &SplitOrderResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -382,7 +382,7 @@ type ListTransactionsResultOperationPosting struct {
|
|||||||
|
|
||||||
type ListTransactionsResultOperationService struct {
|
type ListTransactionsResultOperationService struct {
|
||||||
// Service name
|
// Service name
|
||||||
Name string `json:"name"`
|
Name TransactionOperationService `json:"name"`
|
||||||
|
|
||||||
// Price
|
// Price
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
|
|||||||
@@ -16,11 +16,11 @@ type CreateUpdateProformaLinkParams struct {
|
|||||||
// Shipment number
|
// Shipment number
|
||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
// Proforma invoice link
|
// Invoice link. Use the `v1/invoice/file/upload` method to create a link
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
|
|
||||||
// Invoice HS-code. Pass a number up to 12 characters long
|
// Product HS-codes
|
||||||
HSCode string `json:"hs_code"`
|
HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
|
||||||
|
|
||||||
// Invoice date
|
// Invoice date
|
||||||
Date time.Time `json:"date"`
|
Date time.Time `json:"date"`
|
||||||
@@ -28,13 +28,21 @@ type CreateUpdateProformaLinkParams struct {
|
|||||||
// Invoice number. The number can contain letters and digits, maximum length is 50 characters
|
// Invoice number. The number can contain letters and digits, maximum length is 50 characters
|
||||||
Number string `json:"number"`
|
Number string `json:"number"`
|
||||||
|
|
||||||
// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal poin
|
// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal point
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
|
|
||||||
// Invoice currency
|
// Invoice currency
|
||||||
PriceCurrency InvoiceCurrency `json:"price_currency" default:"USD"`
|
PriceCurrency InvoiceCurrency `json:"price_currency" default:"USD"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CreateUpdateProformaLinkHSCode struct {
|
||||||
|
// Product HS code
|
||||||
|
Code string `json:"code"`
|
||||||
|
|
||||||
|
// Product identifier in the Ozon system, SKU
|
||||||
|
SKU string `json:"sku"`
|
||||||
|
}
|
||||||
|
|
||||||
type CreateUpdateProformaLinkResponse struct {
|
type CreateUpdateProformaLinkResponse struct {
|
||||||
core.CommonResponse
|
core.CommonResponse
|
||||||
|
|
||||||
@@ -42,9 +50,9 @@ type CreateUpdateProformaLinkResponse struct {
|
|||||||
Result bool `json:"result"`
|
Result bool `json:"result"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create or edit proforma invoice link for VAT refund to Turkey sellers
|
// Create or edit an invoice for VAT refund to Turkey sellers
|
||||||
func (c Invoices) CreateUpdate(ctx context.Context, params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
|
func (c Invoices) CreateUpdate(ctx context.Context, params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
|
||||||
url := "/v1/invoice/create-or-update"
|
url := "/v2/invoice/create-or-update"
|
||||||
|
|
||||||
resp := &CreateUpdateProformaLinkResponse{}
|
resp := &CreateUpdateProformaLinkResponse{}
|
||||||
|
|
||||||
@@ -70,13 +78,32 @@ type GetProformaLinkResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GetProformaLinkResult struct {
|
type GetProformaLinkResult struct {
|
||||||
// Proforma invoice link
|
// Invoice uploading date
|
||||||
|
Date time.Time `json:"date"`
|
||||||
|
|
||||||
|
// Invoice link
|
||||||
FileURL string `json:"file_url"`
|
FileURL string `json:"file_url"`
|
||||||
|
|
||||||
|
// Product HS-codes
|
||||||
|
HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
|
||||||
|
|
||||||
|
// Invoice number
|
||||||
|
Number string `json:"number"`
|
||||||
|
|
||||||
|
// Cost stated in the invoice.
|
||||||
|
// The fractional part is separated by decimal point,
|
||||||
|
// up to two digits after the decimal point.
|
||||||
|
//
|
||||||
|
// Example: 199.99
|
||||||
|
Price float64 `json:"price"`
|
||||||
|
|
||||||
|
// Invoice currency
|
||||||
|
PriceCurrency InvoiceCurrency `json:"price_currency"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get a proforma invoice link
|
// Get a proforma invoice link
|
||||||
func (c Invoices) Get(ctx context.Context, params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
|
func (c Invoices) Get(ctx context.Context, params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
|
||||||
url := "/v1/invoice/get"
|
url := "/v2/invoice/get"
|
||||||
|
|
||||||
resp := &GetProformaLinkResponse{}
|
resp := &GetProformaLinkResponse{}
|
||||||
|
|
||||||
@@ -114,3 +141,33 @@ func (c Invoices) Delete(ctx context.Context, params *DeleteProformaLinkParams)
|
|||||||
|
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type UploadInvoiceParams struct {
|
||||||
|
// Base64 encoded invoice
|
||||||
|
Content string `json:"base64_content"`
|
||||||
|
|
||||||
|
// Shipment number
|
||||||
|
PostingNumber string `json:"posting_number"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UploadInvoiceResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Link to invoice
|
||||||
|
URL string `json:"url"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Available file types: JPEG and PDF. Maximum file size: 10 MB
|
||||||
|
func (c Invoices) Upload(ctx context.Context, params *UploadInvoiceParams) (*UploadInvoiceResponse, error) {
|
||||||
|
url := "/v1/invoice/file/upload"
|
||||||
|
|
||||||
|
resp := &UploadInvoiceResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,7 +24,16 @@ func TestCreateUpdateProformaLink(t *testing.T) {
|
|||||||
&CreateUpdateProformaLinkParams{
|
&CreateUpdateProformaLinkParams{
|
||||||
PostingNumber: "33920146-0252-1",
|
PostingNumber: "33920146-0252-1",
|
||||||
URL: "https://cdn.ozone.ru/s3/ozon-disk-api/techdoc/seller-api/earsivfatura_1690960445.pdf",
|
URL: "https://cdn.ozone.ru/s3/ozon-disk-api/techdoc/seller-api/earsivfatura_1690960445.pdf",
|
||||||
HSCode: "2134322",
|
HSCodes: []CreateUpdateProformaLinkHSCode{
|
||||||
|
{
|
||||||
|
Code: "534758761999",
|
||||||
|
SKU: "SKU123",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Code: "534758761000",
|
||||||
|
SKU: "SKU456",
|
||||||
|
},
|
||||||
|
},
|
||||||
Date: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2023-08-01T12:08:44.342Z"),
|
Date: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2023-08-01T12:08:44.342Z"),
|
||||||
Number: "424fdsf234",
|
Number: "424fdsf234",
|
||||||
Price: 234.34,
|
Price: 234.34,
|
||||||
@@ -82,7 +91,17 @@ func TestGetProformaLink(t *testing.T) {
|
|||||||
},
|
},
|
||||||
`{
|
`{
|
||||||
"result": {
|
"result": {
|
||||||
"file_url": "string"
|
"date": "2019-08-24T14:15:22Z",
|
||||||
|
"file_url": "string",
|
||||||
|
"hs_codes": [
|
||||||
|
{
|
||||||
|
"code": "string",
|
||||||
|
"sku": "string"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"number": "string",
|
||||||
|
"price": 0,
|
||||||
|
"price_currency": "string"
|
||||||
}
|
}
|
||||||
}`,
|
}`,
|
||||||
},
|
},
|
||||||
@@ -165,3 +184,54 @@ func TestDeleteProformaLink(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUploadInvoice(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *UploadInvoiceParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&UploadInvoiceParams{
|
||||||
|
PostingNumber: "posting number",
|
||||||
|
Content: "content",
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"url": "string"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&UploadInvoiceParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Invoices().Upload(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &UploadInvoiceResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ type Client struct {
|
|||||||
certificates *Certificates
|
certificates *Certificates
|
||||||
strategies *Strategies
|
strategies *Strategies
|
||||||
barcodes *Barcodes
|
barcodes *Barcodes
|
||||||
|
passes *Passes
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) Analytics() *Analytics {
|
func (c Client) Analytics() *Analytics {
|
||||||
@@ -119,6 +120,10 @@ func (c Client) Barcodes() *Barcodes {
|
|||||||
return c.barcodes
|
return c.barcodes
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c Client) Passes() *Passes {
|
||||||
|
return c.passes
|
||||||
|
}
|
||||||
|
|
||||||
type ClientOption func(c *ClientOptions)
|
type ClientOption func(c *ClientOptions)
|
||||||
|
|
||||||
func WithHttpClient(httpClient core.HttpClient) ClientOption {
|
func WithHttpClient(httpClient core.HttpClient) ClientOption {
|
||||||
@@ -182,6 +187,7 @@ func NewClient(opts ...ClientOption) *Client {
|
|||||||
certificates: &Certificates{client: coreClient},
|
certificates: &Certificates{client: coreClient},
|
||||||
strategies: &Strategies{client: coreClient},
|
strategies: &Strategies{client: coreClient},
|
||||||
barcodes: &Barcodes{client: coreClient},
|
barcodes: &Barcodes{client: coreClient},
|
||||||
|
passes: &Passes{client: coreClient},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,5 +215,6 @@ func NewMockClient(handler http.HandlerFunc) *Client {
|
|||||||
certificates: &Certificates{client: coreClient},
|
certificates: &Certificates{client: coreClient},
|
||||||
strategies: &Strategies{client: coreClient},
|
strategies: &Strategies{client: coreClient},
|
||||||
barcodes: &Barcodes{client: coreClient},
|
barcodes: &Barcodes{client: coreClient},
|
||||||
|
passes: &Passes{client: coreClient},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
302
ozon/pass.go
Normal file
302
ozon/pass.go
Normal file
@@ -0,0 +1,302 @@
|
|||||||
|
package ozon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
core "github.com/diphantxm/ozon-api-client"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Passes struct {
|
||||||
|
client *core.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListPassesParams struct {
|
||||||
|
// Cursor for the next data sample
|
||||||
|
Cursor string `json:"curson"`
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
Filter ListPassesFilter `json:"filter"`
|
||||||
|
|
||||||
|
// Limit on number of entries in a reply. Default value is 1000. Maximum value is 1000
|
||||||
|
Limit int32 `json:"limit"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListPassesFilter struct {
|
||||||
|
// Filter by pass identifier
|
||||||
|
ArrivalPassIds []string `json:"arrival_pass_ids"`
|
||||||
|
|
||||||
|
// Filter by purpose of arrival:
|
||||||
|
//
|
||||||
|
// FBS_DELIVERY—delivery.
|
||||||
|
// FBS_RETURN—take out returns.
|
||||||
|
// If the parameter isn't specified, both purposes are considered.
|
||||||
|
//
|
||||||
|
// The specified purpose must be in the list of reasons for passes
|
||||||
|
ArrivalReason string `json:"arrival_reason"`
|
||||||
|
|
||||||
|
// Filter by drop-off points identifier
|
||||||
|
DropoffPointIds []int64 `json:"dropoff_point_ids"`
|
||||||
|
|
||||||
|
// true to get only active pass requests
|
||||||
|
OnlyActivePasses bool `json:"only_active_passes"`
|
||||||
|
|
||||||
|
// Filter by seller's warehouses identifier
|
||||||
|
WarehouseIds []int64 `json:"warehouse_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListPassesResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// List of passes
|
||||||
|
ArrivalPasses []ListPassesArrivalPass `json:"arrival_passes"`
|
||||||
|
|
||||||
|
// Cursor for the next data sample. If the parameter is empty, there is no more data
|
||||||
|
Cursor string `json:"cursor"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListPassesArrivalPass struct {
|
||||||
|
// Pass identifier
|
||||||
|
ArrivalPassId int64 `json:"arrival_pass_id"`
|
||||||
|
|
||||||
|
// Arrival purpose
|
||||||
|
ArrivalReasons []string `json:"arrival_reasons"`
|
||||||
|
|
||||||
|
// Date and time of arrival in UTC format
|
||||||
|
ArrivalTime time.Time `json:"arrival_time"`
|
||||||
|
|
||||||
|
// Driver full name
|
||||||
|
DriverName string `json:"driver_name"`
|
||||||
|
|
||||||
|
// Driver phone number
|
||||||
|
DriverPhone string `json:"driver_phone"`
|
||||||
|
|
||||||
|
// Drop-off point identifier
|
||||||
|
DropoffPointId int64 `json:"dropoff_point_id"`
|
||||||
|
|
||||||
|
// true if the request is active
|
||||||
|
IsActive bool `json:"is_active"`
|
||||||
|
|
||||||
|
// Car license plate
|
||||||
|
VehicleLicensePlate string `json:"vehicle_license_plate"`
|
||||||
|
|
||||||
|
// Car model
|
||||||
|
VehicleModel string `json:"vehicle_model"`
|
||||||
|
|
||||||
|
// Warehouse identifier
|
||||||
|
WarehouseId int64 `json:"warehouse_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) List(ctx context.Context, params *ListPassesParams) (*ListPassesResponse, error) {
|
||||||
|
url := "/v1/pass/list"
|
||||||
|
|
||||||
|
resp := &ListPassesResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateCarriageParams struct {
|
||||||
|
// List of passes
|
||||||
|
ArrivalPasses []CarriageArrivalPass `json:"arrival_passes"`
|
||||||
|
|
||||||
|
// Freight identifier
|
||||||
|
CarriageId int64 `json:"carriage_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CarriageArrivalPass struct {
|
||||||
|
// Driver full name
|
||||||
|
DriverName string `json:"driver_name"`
|
||||||
|
|
||||||
|
// Driver phone number
|
||||||
|
DriverPhone string `json:"driver_phone"`
|
||||||
|
|
||||||
|
// Car license plate
|
||||||
|
VehicleLicensePlate string `json:"vehicle_license_plate"`
|
||||||
|
|
||||||
|
// Car model
|
||||||
|
VehicleModel string `json:"vehicle_model"`
|
||||||
|
|
||||||
|
// true if you will export returns. Default is false
|
||||||
|
WithReturns bool `json:"with_returns"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateCarriageResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Pass identifiers
|
||||||
|
ArrivalPassIds []string `json:"arrival_pass_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) CreateCarriage(ctx context.Context, params *CreateCarriageParams) (*CreateCarriageResponse, error) {
|
||||||
|
url := "/v1/carriage/pass/create"
|
||||||
|
|
||||||
|
resp := &CreateCarriageResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateCarriageParams struct {
|
||||||
|
ArrivalPasses []UpdateCarriageArrivalPass `json:"arrival_passes"`
|
||||||
|
|
||||||
|
CarriageId int64 `json:"carriage_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateCarriageArrivalPass struct {
|
||||||
|
CarriageArrivalPass
|
||||||
|
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateCarriageResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) UpdateCarriage(ctx context.Context, params *UpdateCarriageParams) (*UpdateCarriageResponse, error) {
|
||||||
|
url := "/v1/carriage/pass/update"
|
||||||
|
|
||||||
|
resp := &UpdateCarriageResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteCarriageParams struct {
|
||||||
|
// Pass identifiers
|
||||||
|
ArrivalPassIds []int64 `json:"arrival_pass_ids"`
|
||||||
|
|
||||||
|
// Freight identifier
|
||||||
|
CarriageId int64 `json:"carriage_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteCarriageResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) DeleteCarriage(ctx context.Context, params *DeleteCarriageParams) (*DeleteCarriageResponse, error) {
|
||||||
|
url := "/v1/carriage/pass/delete"
|
||||||
|
|
||||||
|
resp := &DeleteCarriageResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateReturnParams struct {
|
||||||
|
// Array of passes
|
||||||
|
ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnArrivalPass struct {
|
||||||
|
// Date and time of arrival in UTC format. At that time, the pass will become valid
|
||||||
|
ArrivalTime time.Time `json:"arrival_time"`
|
||||||
|
|
||||||
|
// Driver full name
|
||||||
|
DriverName string `json:"driver_name"`
|
||||||
|
|
||||||
|
// Driver phone number
|
||||||
|
DriverPhone string `json:"driver_phone"`
|
||||||
|
|
||||||
|
// Car license plate
|
||||||
|
VehicleLicensePlate string `json:"vehicle_license_plate"`
|
||||||
|
|
||||||
|
// Car model
|
||||||
|
VehicleModel string `json:"vehicle_model"`
|
||||||
|
|
||||||
|
// Drop-off point identifier for which the pass is issued
|
||||||
|
DropoffPointId int64 `json:"dropoff_point_id"`
|
||||||
|
|
||||||
|
// Warehouse identifier
|
||||||
|
WarehouseId int64 `json:"warehouse_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateReturnResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Pass identifiers
|
||||||
|
ArrivalPassIds []string `json:"arrival_pass_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) CreateReturn(ctx context.Context, params *CreateReturnParams) (*CreateReturnResponse, error) {
|
||||||
|
url := "/v1/return/pass/create"
|
||||||
|
|
||||||
|
resp := &CreateReturnResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateReturnParams struct {
|
||||||
|
ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateReturnResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Pass identifiers
|
||||||
|
ArrivalPassIds []string `json:"arrival_pass_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) UpdateReturn(ctx context.Context, params *UpdateReturnParams) (*UpdateReturnResponse, error) {
|
||||||
|
url := "/v1/return/pass/update"
|
||||||
|
|
||||||
|
resp := &UpdateReturnResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteReturnParams struct {
|
||||||
|
// Pass identifiers
|
||||||
|
ArrivalPassIds []int64 `json:"arrival_pass_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteReturnResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Passes) DeleteReturn(ctx context.Context, params *DeleteReturnParams) (*DeleteReturnResponse, error) {
|
||||||
|
url := "/v1/return/pass/delete"
|
||||||
|
|
||||||
|
resp := &DeleteReturnResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
431
ozon/pass_test.go
Normal file
431
ozon/pass_test.go
Normal file
@@ -0,0 +1,431 @@
|
|||||||
|
package ozon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
core "github.com/diphantxm/ozon-api-client"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestListPasses(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *ListPassesParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&ListPassesParams{
|
||||||
|
Cursor: "",
|
||||||
|
Filter: ListPassesFilter{
|
||||||
|
ArrivalPassIds: []string{"string"},
|
||||||
|
ArrivalReason: "string",
|
||||||
|
DropoffPointIds: []int64{123},
|
||||||
|
OnlyActivePasses: true,
|
||||||
|
WarehouseIds: []int64{456},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"arrival_passes": [
|
||||||
|
{
|
||||||
|
"arrival_pass_id": 0,
|
||||||
|
"arrival_reasons": [
|
||||||
|
"string"
|
||||||
|
],
|
||||||
|
"arrival_time": "2019-08-24T14:15:22Z",
|
||||||
|
"driver_name": "string",
|
||||||
|
"driver_phone": "string",
|
||||||
|
"dropoff_point_id": 123,
|
||||||
|
"is_active": true,
|
||||||
|
"vehicle_license_plate": "string",
|
||||||
|
"vehicle_model": "string",
|
||||||
|
"warehouse_id": 456
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"cursor": "string"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&ListPassesParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().List(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &ListPassesResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(resp.ArrivalPasses) != 0 {
|
||||||
|
if resp.ArrivalPasses[0].WarehouseId != test.params.Filter.WarehouseIds[0] {
|
||||||
|
t.Errorf("warehouse id in request and response should be equal")
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.ArrivalPasses[0].DropoffPointId != test.params.Filter.DropoffPointIds[0] {
|
||||||
|
t.Errorf("dropoff point id in request and response should be equal")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateArrivalPass(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *CreateCarriageParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&CreateCarriageParams{
|
||||||
|
ArrivalPasses: []CarriageArrivalPass{
|
||||||
|
{
|
||||||
|
DriverName: "string",
|
||||||
|
DriverPhone: "string",
|
||||||
|
VehicleLicensePlate: "string",
|
||||||
|
VehicleModel: "string",
|
||||||
|
WithReturns: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
CarriageId: 14,
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"arrival_pass_ids": [
|
||||||
|
"154"
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&CreateCarriageParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().CreateCarriage(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &CreateCarriageResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpdateArrivalPass(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *UpdateCarriageParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&UpdateCarriageParams{
|
||||||
|
ArrivalPasses: []UpdateCarriageArrivalPass{
|
||||||
|
{
|
||||||
|
Id: 11,
|
||||||
|
CarriageArrivalPass: CarriageArrivalPass{
|
||||||
|
DriverName: "string",
|
||||||
|
DriverPhone: "string",
|
||||||
|
VehicleLicensePlate: "string",
|
||||||
|
VehicleModel: "string",
|
||||||
|
WithReturns: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
CarriageId: 14,
|
||||||
|
},
|
||||||
|
`{}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&UpdateCarriageParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().UpdateCarriage(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &UpdateCarriageResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteArrivalPass(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *DeleteCarriageParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&DeleteCarriageParams{
|
||||||
|
ArrivalPassIds: []int64{123},
|
||||||
|
CarriageId: 14,
|
||||||
|
},
|
||||||
|
`{}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&DeleteCarriageParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().DeleteCarriage(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &DeleteCarriageResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateReturn(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *CreateReturnParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&CreateReturnParams{
|
||||||
|
ArrivalPasses: []ReturnArrivalPass{
|
||||||
|
{
|
||||||
|
ArrivalTime: time.Now(),
|
||||||
|
DriverName: "string",
|
||||||
|
DriverPhone: "string",
|
||||||
|
VehicleLicensePlate: "string",
|
||||||
|
VehicleModel: "string",
|
||||||
|
DropoffPointId: 11,
|
||||||
|
WarehouseId: 5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"arrival_pass_ids": [
|
||||||
|
"1111"
|
||||||
|
]
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&CreateReturnParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().CreateReturn(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &CreateReturnResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpdateReturn(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *UpdateReturnParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&UpdateReturnParams{
|
||||||
|
ArrivalPasses: []ReturnArrivalPass{
|
||||||
|
{
|
||||||
|
ArrivalTime: time.Now(),
|
||||||
|
DriverName: "string",
|
||||||
|
DriverPhone: "string",
|
||||||
|
VehicleLicensePlate: "string",
|
||||||
|
VehicleModel: "string",
|
||||||
|
DropoffPointId: 11,
|
||||||
|
WarehouseId: 5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
`{}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&UpdateReturnParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().UpdateReturn(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &UpdateReturnResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteReturn(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *DeleteReturnParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&DeleteReturnParams{
|
||||||
|
ArrivalPassIds: []int64{456},
|
||||||
|
},
|
||||||
|
`{}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&DeleteReturnParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Passes().DeleteReturn(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &DeleteReturnResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
148
ozon/products.go
148
ozon/products.go
@@ -27,13 +27,13 @@ type GetStocksInfoParams struct {
|
|||||||
|
|
||||||
type GetStocksInfoFilter struct {
|
type GetStocksInfoFilter struct {
|
||||||
// Filter by the offer_id parameter. It is possible to pass a list of values
|
// Filter by the offer_id parameter. It is possible to pass a list of values
|
||||||
OfferId string `json:"offer_id"`
|
OfferId []string `json:"offer_id,omitempty"`
|
||||||
|
|
||||||
// Filter by the product_id parameter. It is possible to pass a list of values
|
// Filter by the product_id parameter. It is possible to pass a list of values
|
||||||
ProductId int64 `json:"product_id"`
|
ProductId []int64 `json:"product_id,omitempty"`
|
||||||
|
|
||||||
// Filter by product visibility
|
// Filter by product visibility
|
||||||
Visibility string `json:"visibility"`
|
Visibility string `json:"visibility,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetStocksInfoResponse struct {
|
type GetStocksInfoResponse struct {
|
||||||
@@ -99,13 +99,13 @@ func (c Products) GetStocksInfo(ctx context.Context, params *GetStocksInfoParams
|
|||||||
|
|
||||||
type GetProductDetailsParams struct {
|
type GetProductDetailsParams struct {
|
||||||
// Product identifier in the seller's system
|
// Product identifier in the seller's system
|
||||||
OfferId string `json:"offer_id"`
|
OfferId string `json:"offer_id,omitempty"`
|
||||||
|
|
||||||
// Product identifier
|
// Product identifier
|
||||||
ProductId int64 `json:"product_id"`
|
ProductId int64 `json:"product_id,omitempty"`
|
||||||
|
|
||||||
// Product identifier in the Ozon system, SKU
|
// Product identifier in the Ozon system, SKU
|
||||||
SKU int64 `json:"sku"`
|
SKU int64 `json:"sku,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetProductDetailsResponse struct {
|
type GetProductDetailsResponse struct {
|
||||||
@@ -145,7 +145,13 @@ type ProductDetails struct {
|
|||||||
// Product SKU
|
// Product SKU
|
||||||
SKU int64 `json:"sku"`
|
SKU int64 `json:"sku"`
|
||||||
|
|
||||||
// Document generation task number
|
// SKU of the product that is sold from the Ozon warehouse (FBO)
|
||||||
|
FBOSKU int64 `json:"fbo_sku,omitempty"`
|
||||||
|
|
||||||
|
// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
|
||||||
|
FBSSKU int64 `json:"fbs_sku,omitempty"`
|
||||||
|
|
||||||
|
// Product identifier
|
||||||
Id int64 `json:"id"`
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
// An array of links to images. The images in the array are arranged in the order of their arrangement on the site. If the `primary_image` parameter is not specified, the first image in the list is the main one for the product
|
// An array of links to images. The images in the array are arranged in the order of their arrangement on the site. If the `primary_image` parameter is not specified, the first image in the list is the main one for the product
|
||||||
@@ -206,9 +212,6 @@ type ProductDetails struct {
|
|||||||
// Price before discounts. Displayed strikethrough on the product description page
|
// Price before discounts. Displayed strikethrough on the product description page
|
||||||
OldPrice string `json:"old_price"`
|
OldPrice string `json:"old_price"`
|
||||||
|
|
||||||
// Price for customers with an Ozon Premium subscription
|
|
||||||
PremiumPrice string `json:"premium_price"`
|
|
||||||
|
|
||||||
// Product price including discounts. This value is shown on the product description page
|
// Product price including discounts. This value is shown on the product description page
|
||||||
Price string `json:"price"`
|
Price string `json:"price"`
|
||||||
|
|
||||||
@@ -220,9 +223,6 @@ type ProductDetails struct {
|
|||||||
// Use PriceIndexes instead
|
// Use PriceIndexes instead
|
||||||
PriceIndex string `json:"price_index"`
|
PriceIndex string `json:"price_index"`
|
||||||
|
|
||||||
// Product price suggested by the system based on similar offers
|
|
||||||
RecommendedPrice string `json:"recommended_price"`
|
|
||||||
|
|
||||||
// Product state description
|
// Product state description
|
||||||
Status ProductDetailStatus `json:"status"`
|
Status ProductDetailStatus `json:"status"`
|
||||||
|
|
||||||
@@ -246,15 +246,18 @@ type ProductDetails struct {
|
|||||||
|
|
||||||
// Product volume weight
|
// Product volume weight
|
||||||
VolumeWeight float64 `json:"volume_weight"`
|
VolumeWeight float64 `json:"volume_weight"`
|
||||||
|
|
||||||
|
// 'true' if the item is archived manually.
|
||||||
|
IsArchived bool `json:"is_archived"`
|
||||||
|
|
||||||
|
// 'true' if the item is archived automatically.
|
||||||
|
IsArchivedAuto bool `json:"is_autoarchived"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductDetailCommission struct {
|
type ProductDetailCommission struct {
|
||||||
// Delivery cost
|
// Delivery cost
|
||||||
DeliveryAmount float64 `json:"deliveryAmount"`
|
DeliveryAmount float64 `json:"deliveryAmount"`
|
||||||
|
|
||||||
// Minimum commission fee
|
|
||||||
MinValue float64 `json:"minValue"`
|
|
||||||
|
|
||||||
// Commission percentage
|
// Commission percentage
|
||||||
Percent float64 `json:"percent"`
|
Percent float64 `json:"percent"`
|
||||||
|
|
||||||
@@ -712,9 +715,7 @@ type UpdatePricesResultError struct {
|
|||||||
|
|
||||||
// Allows you to change a price of one or more products.
|
// Allows you to change a price of one or more products.
|
||||||
// You can change prices for 1000 products in one request.
|
// You can change prices for 1000 products in one request.
|
||||||
// To reset old_price or premium_price set these parameters to 0.
|
// To reset old_price, set 0 for this parameter
|
||||||
//
|
|
||||||
// A new price must differ from the old one by at least 5%.
|
|
||||||
func (c Products) UpdatePrices(ctx context.Context, 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"
|
||||||
|
|
||||||
@@ -746,6 +747,9 @@ type CreateOrUpdateProductItem struct {
|
|||||||
// Category identifier
|
// Category identifier
|
||||||
DescriptionCategoryId int64 `json:"description_category_id"`
|
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||||
|
|
||||||
|
// New category identifier. Specify it if you want to change the current product category
|
||||||
|
NewDescriptinoCategoryId int64 `json:"new_description_category_id"`
|
||||||
|
|
||||||
// Marketing color.
|
// Marketing color.
|
||||||
//
|
//
|
||||||
// Pass the link to the image in the public cloud storage. The image format is JPG
|
// Pass the link to the image in the public cloud storage. The image format is JPG
|
||||||
@@ -808,9 +812,6 @@ type CreateOrUpdateProductItem struct {
|
|||||||
// List of PDF files
|
// List of PDF files
|
||||||
PDFList []CreateOrUpdateProductPDF `json:"pdf_list"`
|
PDFList []CreateOrUpdateProductPDF `json:"pdf_list"`
|
||||||
|
|
||||||
// Price for customers with an Ozon Premium subscription
|
|
||||||
PremiumPrice string `json:"premium_price"`
|
|
||||||
|
|
||||||
// Product price including discounts. This value is shown on the product description card.
|
// Product price including discounts. This value is shown on the product description card.
|
||||||
// If there are no discounts on the product, specify the old_price value
|
// If there are no discounts on the product, specify the old_price value
|
||||||
Price string `json:"price"`
|
Price string `json:"price"`
|
||||||
@@ -821,6 +822,12 @@ type CreateOrUpdateProductItem struct {
|
|||||||
// - IS_NO_CODE_SERVICE
|
// - IS_NO_CODE_SERVICE
|
||||||
ServiceType string `json:"service_type" default:"IS_CODE_SERVICE"`
|
ServiceType string `json:"service_type" default:"IS_CODE_SERVICE"`
|
||||||
|
|
||||||
|
// Product type identifier.
|
||||||
|
// You can get values from the type_id parameter in the `/v1/description-category/tree` method response.
|
||||||
|
// When filling this parameter in,
|
||||||
|
// you can leave out the attributes attribute if it has the `id:8229` parameter
|
||||||
|
TypeId int64 `json:"type_id"`
|
||||||
|
|
||||||
// VAT rate for the product:
|
// VAT rate for the product:
|
||||||
// - 0 — not subject to VAT,
|
// - 0 — not subject to VAT,
|
||||||
// - 0.1 — 10%,
|
// - 0.1 — 10%,
|
||||||
@@ -856,7 +863,7 @@ type CreateOrUpdateAttribute struct {
|
|||||||
|
|
||||||
type CreateOrUpdateAttributeValue struct {
|
type CreateOrUpdateAttributeValue struct {
|
||||||
// Directory identifier
|
// Directory identifier
|
||||||
DictionaryValueId int64 `json:"dictrionary_value_id"`
|
DictionaryValueId int64 `json:"dictionary_value_id"`
|
||||||
|
|
||||||
// Value from the directory
|
// Value from the directory
|
||||||
Value string `json:"value"`
|
Value string `json:"value"`
|
||||||
@@ -890,6 +897,7 @@ 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
|
||||||
|
// More info: https://docs.ozon.ru/api/seller/en/#operation/ProductAPI_ImportProductsV3
|
||||||
func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
|
func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
|
||||||
url := "/v3/product/import"
|
url := "/v3/product/import"
|
||||||
|
|
||||||
@@ -1132,9 +1140,6 @@ type CreateProductsByOzonIDItem struct {
|
|||||||
// The fractional part is separated by decimal point, up to two digits after the decimal point
|
// The fractional part is separated by decimal point, up to two digits after the decimal point
|
||||||
OldPrice string `json:"old_price"`
|
OldPrice string `json:"old_price"`
|
||||||
|
|
||||||
// Price for customers with an Ozon Premium subscription
|
|
||||||
PremiumPrice string `json:"premium_price"`
|
|
||||||
|
|
||||||
// Product price including discounts. This value is shown on the product description page.
|
// Product price including discounts. This value is shown on the product description page.
|
||||||
// If there are no discounts, pass the old_price value in this parameter
|
// If there are no discounts, pass the old_price value in this parameter
|
||||||
Price string `json:"price"`
|
Price string `json:"price"`
|
||||||
@@ -1235,7 +1240,7 @@ type ProductInfoResultPicture struct {
|
|||||||
//
|
//
|
||||||
// If you called the `/v1/product/pictures/info` method, one of the statuses will appear:
|
// If you called the `/v1/product/pictures/info` method, one of the statuses will appear:
|
||||||
// - uploaded — image uploaded;
|
// - uploaded — image uploaded;
|
||||||
// - failed — image was not uploaded
|
// - pending — image was not uploaded
|
||||||
State string `json:"state"`
|
State string `json:"state"`
|
||||||
|
|
||||||
// The link to the image in the public cloud storage. The image format is JPG or PNG
|
// The link to the image in the public cloud storage. The image format is JPG or PNG
|
||||||
@@ -1350,10 +1355,10 @@ type GetDescriptionOfProductParams struct {
|
|||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
|
|
||||||
// The parameter by which the products will be sorted
|
// The parameter by which the products will be sorted
|
||||||
SortBy string `json:"sort_by"`
|
SortBy string `json:"sort_by,omitempty"`
|
||||||
|
|
||||||
// Sorting direction
|
// Sorting direction
|
||||||
SortDirection string `json:"sort_direction"`
|
SortDirection string `json:"sort_dir,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetDescriptionOfProductFilter struct {
|
type GetDescriptionOfProductFilter struct {
|
||||||
@@ -1413,9 +1418,6 @@ type GetDescriptionOfProductResult struct {
|
|||||||
// Product characteristic identifier
|
// Product characteristic identifier
|
||||||
Id int64 `json:"id"`
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
// Identifier for subsequent batch loading of images
|
|
||||||
ImageGroupId string `json:"image_group_id"`
|
|
||||||
|
|
||||||
// Array of links to product images
|
// Array of links to product images
|
||||||
Images []GetDescriptionOfProductResultImage `json:"images"`
|
Images []GetDescriptionOfProductResultImage `json:"images"`
|
||||||
|
|
||||||
@@ -1431,6 +1433,9 @@ type GetDescriptionOfProductResult struct {
|
|||||||
// Array of PDF files
|
// Array of PDF files
|
||||||
PDFList []GetDescriptionOfProductResultPDF `json:"pdf_list"`
|
PDFList []GetDescriptionOfProductResultPDF `json:"pdf_list"`
|
||||||
|
|
||||||
|
// Product type identifier
|
||||||
|
TypeId int64 `json:"type_id"`
|
||||||
|
|
||||||
// Weight of product in the package
|
// Weight of product in the package
|
||||||
Weight int32 `json:"weight"`
|
Weight int32 `json:"weight"`
|
||||||
|
|
||||||
@@ -1612,7 +1617,7 @@ func (c Products) GetProductRangeLimit(ctx context.Context) (*GetProductRangeLim
|
|||||||
|
|
||||||
resp := &GetProductRangeLimitResponse{}
|
resp := &GetProductRangeLimitResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, &struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -1757,67 +1762,6 @@ func (c Products) RemoveProductWithoutSKU(ctx context.Context, params *RemovePro
|
|||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListGeoRestrictionsParams struct {
|
|
||||||
// Filter. To get all geo-restrictions, leave names blank and specify true in the only_visible parameter
|
|
||||||
Filter ListGeoRestrictionsFilter `json:"filter"`
|
|
||||||
|
|
||||||
// Order number of geo-restriction from which to output data in the response.
|
|
||||||
//
|
|
||||||
// If you specify 23 in this parameter, the first item in the restrictions list will output order_number = 24.
|
|
||||||
// If you want to get all geo-restrictions, pass 0 in this parameter
|
|
||||||
LastOrderNumber int64 `json:"last_order_number"`
|
|
||||||
|
|
||||||
// Number of items in the response
|
|
||||||
Limit int64 `json:"limit"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ListGeoRestrictionsFilter struct {
|
|
||||||
// List with city names
|
|
||||||
Names []string `json:"names"`
|
|
||||||
|
|
||||||
// Value visibility. We recommend always passing true in this parameter
|
|
||||||
OnlyVisible bool `json:"only_visible"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ListGeoRestrictionsResponse struct {
|
|
||||||
core.CommonResponse
|
|
||||||
|
|
||||||
// Restrictions
|
|
||||||
Restrictions []ListGeoRestrictionsRestriction `json:"restrictions"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ListGeoRestrictionsRestriction struct {
|
|
||||||
// Geo-restriction identifier
|
|
||||||
Id string `json:"id"`
|
|
||||||
|
|
||||||
// Item visibility
|
|
||||||
IsVisible bool `json:"is_visible"`
|
|
||||||
|
|
||||||
// City name
|
|
||||||
Name string `json:"name"`
|
|
||||||
|
|
||||||
// Geo-restriction order number.
|
|
||||||
//
|
|
||||||
// If you specify 23 in the last_order_number parameter in the request,
|
|
||||||
// the first item in the restrictions list will have order_number = 24
|
|
||||||
OrderNumber int64 `json:"order_number"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get a list of geo-restrictions for services
|
|
||||||
func (c Products) ListGeoRestrictions(ctx context.Context, params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) {
|
|
||||||
url := "/v1/products/geo-restrictions-catalog-by-filter"
|
|
||||||
|
|
||||||
resp := &ListGeoRestrictionsResponse{}
|
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
response.CopyCommonResponse(&resp.CommonResponse)
|
|
||||||
|
|
||||||
return resp, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type UploadActivationCodesParams struct {
|
type UploadActivationCodesParams struct {
|
||||||
// Digital activation codes
|
// Digital activation codes
|
||||||
DigitalCodes []string `json:"digital_codes"`
|
DigitalCodes []string `json:"digital_codes"`
|
||||||
@@ -1921,7 +1865,7 @@ type GetProductPriceInfoResponse struct {
|
|||||||
|
|
||||||
type GetProductPriceInfoResult struct {
|
type GetProductPriceInfoResult struct {
|
||||||
// Products list
|
// Products list
|
||||||
Items []GetPRoductPriceInfoResultItem `json:"items"`
|
Items []GetProductPriceInfoResultItem `json:"items"`
|
||||||
|
|
||||||
// Identifier of the last value on page. Leave this field blank in the first request.
|
// Identifier of the last value on page. Leave this field blank in the first request.
|
||||||
//
|
//
|
||||||
@@ -1932,7 +1876,7 @@ type GetProductPriceInfoResult struct {
|
|||||||
Total int32 `json:"total"`
|
Total int32 `json:"total"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetPRoductPriceInfoResultItem struct {
|
type GetProductPriceInfoResultItem struct {
|
||||||
// Maximum acquiring fee
|
// Maximum acquiring fee
|
||||||
Acquiring int32 `json:"acquiring"`
|
Acquiring int32 `json:"acquiring"`
|
||||||
|
|
||||||
@@ -1940,7 +1884,7 @@ type GetPRoductPriceInfoResultItem struct {
|
|||||||
Commissions GetProductPriceInfoResultItemCommission `json:"commissions"`
|
Commissions GetProductPriceInfoResultItemCommission `json:"commissions"`
|
||||||
|
|
||||||
// Promotions information
|
// Promotions information
|
||||||
MarketingActions []GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
|
MarketingActions *GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
|
||||||
|
|
||||||
// Seller product identifier
|
// Seller product identifier
|
||||||
OfferId string `json:"offer_id"`
|
OfferId string `json:"offer_id"`
|
||||||
@@ -2069,15 +2013,9 @@ type GetProductPriceInfoResultItemPrice struct {
|
|||||||
// Price before discounts. Displayed strikethrough on the product description page
|
// Price before discounts. Displayed strikethrough on the product description page
|
||||||
OldPrice string `json:"old_price"`
|
OldPrice string `json:"old_price"`
|
||||||
|
|
||||||
// Price for customers with an Ozon Premium subscription
|
|
||||||
PremiumPrice string `json:"premium_price"`
|
|
||||||
|
|
||||||
// Product price including discounts. This value is shown on the product description page
|
// Product price including discounts. This value is shown on the product description page
|
||||||
Price string `json:"price"`
|
Price string `json:"price"`
|
||||||
|
|
||||||
// Product price suggested by the system based on similar offers
|
|
||||||
RecommendedPrice string `json:"recommended_price"`
|
|
||||||
|
|
||||||
// Retailer price
|
// Retailer price
|
||||||
RetailPrice string `json:"retail_price"`
|
RetailPrice string `json:"retail_price"`
|
||||||
|
|
||||||
@@ -2391,9 +2329,11 @@ type GetRelatedSKUsError struct {
|
|||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// You can pass any SKU in the request, even a deleted one.
|
// Method for getting a single SKU based on the old SKU FBS and SKU FBO identifiers.
|
||||||
// The response will contain all SKUs related to the passed ones.
|
// The response will contain all SKUs related to the passed ones.
|
||||||
//
|
//
|
||||||
|
// The method can handle any SKU, even hidden or deleted.
|
||||||
|
//
|
||||||
// In one request, you can pass up to 200 SKUs.
|
// In one request, you can pass up to 200 SKUs.
|
||||||
func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsParams) (*GetRelatedSKUsResponse, error) {
|
func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsParams) (*GetRelatedSKUsResponse, error) {
|
||||||
url := "/v1/product/related-sku/get"
|
url := "/v1/product/related-sku/get"
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ func TestGetStocksInfo(t *testing.T) {
|
|||||||
Limit: 100,
|
Limit: 100,
|
||||||
LastId: "",
|
LastId: "",
|
||||||
Filter: GetStocksInfoFilter{
|
Filter: GetStocksInfoFilter{
|
||||||
OfferId: "136834",
|
OfferId: []string{"136834"},
|
||||||
ProductId: 214887921,
|
ProductId: []int64{214887921},
|
||||||
Visibility: "ALL",
|
Visibility: "ALL",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -145,9 +145,7 @@ func TestGetProductDetails(t *testing.T) {
|
|||||||
"marketing_price": "",
|
"marketing_price": "",
|
||||||
"min_price": "",
|
"min_price": "",
|
||||||
"old_price": "",
|
"old_price": "",
|
||||||
"premium_price": "",
|
|
||||||
"price": "590.0000",
|
"price": "590.0000",
|
||||||
"recommended_price": "",
|
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"is_enabled": true,
|
"is_enabled": true,
|
||||||
@@ -253,7 +251,9 @@ func TestGetProductDetails(t *testing.T) {
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"state_updated_at": "2021-10-21T15:48:03.927309Z"
|
"state_updated_at": "2021-10-21T15:48:03.927309Z"
|
||||||
}
|
},
|
||||||
|
"is_archived": false,
|
||||||
|
"is_autoarchived": false
|
||||||
}
|
}
|
||||||
}`,
|
}`,
|
||||||
},
|
},
|
||||||
@@ -685,7 +685,6 @@ func TestCreateOrUpdateProduct(t *testing.T) {
|
|||||||
Name: "Комплект защитных плёнок для X3 NFC. Темный хлопок",
|
Name: "Комплект защитных плёнок для X3 NFC. Темный хлопок",
|
||||||
OfferId: "143210608",
|
OfferId: "143210608",
|
||||||
OldPrice: "1100",
|
OldPrice: "1100",
|
||||||
PremiumPrice: "900",
|
|
||||||
Price: "1000",
|
Price: "1000",
|
||||||
VAT: "0.1",
|
VAT: "0.1",
|
||||||
Weight: 100,
|
Weight: 100,
|
||||||
@@ -1153,7 +1152,6 @@ func TestCreateProductByOzonID(t *testing.T) {
|
|||||||
OfferId: "91132",
|
OfferId: "91132",
|
||||||
OldPrice: "2590",
|
OldPrice: "2590",
|
||||||
Price: "2300",
|
Price: "2300",
|
||||||
PremiumPrice: "2200",
|
|
||||||
CurrencyCode: "RUB",
|
CurrencyCode: "RUB",
|
||||||
SKU: 298789742,
|
SKU: 298789742,
|
||||||
VAT: "0.1",
|
VAT: "0.1",
|
||||||
@@ -1393,9 +1391,7 @@ func TestListProductsByIDs(t *testing.T) {
|
|||||||
"marketing_price": "",
|
"marketing_price": "",
|
||||||
"min_price": "",
|
"min_price": "",
|
||||||
"old_price": "1000.0000",
|
"old_price": "1000.0000",
|
||||||
"premium_price": "590.0000",
|
|
||||||
"price": "690.0000",
|
"price": "690.0000",
|
||||||
"recommended_price": "",
|
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"is_enabled": true,
|
"is_enabled": true,
|
||||||
@@ -1470,9 +1466,7 @@ func TestListProductsByIDs(t *testing.T) {
|
|||||||
"marketing_price": "",
|
"marketing_price": "",
|
||||||
"min_price": "",
|
"min_price": "",
|
||||||
"old_price": "12200.0000",
|
"old_price": "12200.0000",
|
||||||
"premium_price": "5490.0000",
|
|
||||||
"price": "6100.0000",
|
"price": "6100.0000",
|
||||||
"recommended_price": "",
|
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"is_enabled": true,
|
"is_enabled": true,
|
||||||
@@ -1617,7 +1611,6 @@ func TestGetDescriptionOfProduct(t *testing.T) {
|
|||||||
"index": 2
|
"index": 2
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"image_group_id": "",
|
|
||||||
"images360": [],
|
"images360": [],
|
||||||
"pdf_list": [],
|
"pdf_list": [],
|
||||||
"attributes": [
|
"attributes": [
|
||||||
@@ -2147,79 +2140,6 @@ func TestRemoveProductWithoutSKU(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestListGeoRestrictions(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
statusCode int
|
|
||||||
headers map[string]string
|
|
||||||
params *ListGeoRestrictionsParams
|
|
||||||
response string
|
|
||||||
}{
|
|
||||||
// Test Ok
|
|
||||||
{
|
|
||||||
http.StatusOK,
|
|
||||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
|
||||||
&ListGeoRestrictionsParams{
|
|
||||||
Filter: ListGeoRestrictionsFilter{
|
|
||||||
OnlyVisible: true,
|
|
||||||
},
|
|
||||||
LastOrderNumber: 0,
|
|
||||||
Limit: 3,
|
|
||||||
},
|
|
||||||
`{
|
|
||||||
"restrictions": [
|
|
||||||
{
|
|
||||||
"id": "world",
|
|
||||||
"name": "Весь Мир",
|
|
||||||
"is_visible": true,
|
|
||||||
"order_number": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "42fb1c32-0cfe-5c96-9fb5-7f8e8449f28c",
|
|
||||||
"name": "Все города РФ",
|
|
||||||
"is_visible": true,
|
|
||||||
"order_number": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "moscow",
|
|
||||||
"name": "Москва",
|
|
||||||
"is_visible": true,
|
|
||||||
"order_number": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
// Test No Client-Id or Api-Key
|
|
||||||
{
|
|
||||||
http.StatusUnauthorized,
|
|
||||||
map[string]string{},
|
|
||||||
&ListGeoRestrictionsParams{},
|
|
||||||
`{
|
|
||||||
"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().ListGeoRestrictions(ctx, test.params)
|
|
||||||
if err != nil {
|
|
||||||
t.Error(err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
compareJsonResponse(t, test.response, &ListGeoRestrictionsResponse{})
|
|
||||||
|
|
||||||
if resp.StatusCode != test.statusCode {
|
|
||||||
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUploadActivationCodes(t *testing.T) {
|
func TestUploadActivationCodes(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
@@ -2356,8 +2276,6 @@ func TestGetProductPriceInfo(t *testing.T) {
|
|||||||
"currency_code": "RUB",
|
"currency_code": "RUB",
|
||||||
"price": "499.0000",
|
"price": "499.0000",
|
||||||
"old_price": "579.0000",
|
"old_price": "579.0000",
|
||||||
"premium_price": "",
|
|
||||||
"recommended_price": "",
|
|
||||||
"retail_price": "",
|
"retail_price": "",
|
||||||
"vat": "0.200000",
|
"vat": "0.200000",
|
||||||
"min_ozon_price": "",
|
"min_ozon_price": "",
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ type AddProductToPromotionParams struct {
|
|||||||
|
|
||||||
type AddProductToPromotionProduct struct {
|
type AddProductToPromotionProduct struct {
|
||||||
// Product identifier
|
// Product identifier
|
||||||
ProductId float64 `json:"produt_id"`
|
ProductId float64 `json:"product_id"`
|
||||||
|
|
||||||
// Promotional product price
|
// Promotional product price
|
||||||
ActionPrice float64 `json:"action_price"`
|
ActionPrice float64 `json:"action_price"`
|
||||||
@@ -136,7 +136,7 @@ func (c Promotions) AddToPromotion(ctx context.Context, params *AddProductToProm
|
|||||||
|
|
||||||
resp := &AddProductToPromotionResponse{}
|
resp := &AddProductToPromotionResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodGet, 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
|
||||||
}
|
}
|
||||||
@@ -154,7 +154,7 @@ type ProductsAvailableForPromotionParams struct {
|
|||||||
|
|
||||||
// Number of elements that will be skipped in the response.
|
// Number of elements that will be skipped in the response.
|
||||||
// For example, if offset=10, the response will start with the 11th element found
|
// For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset float64 `json:"offset"`
|
Offset float64 `json:"offset,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductsAvailableForPromotionResponse struct {
|
type ProductsAvailableForPromotionResponse struct {
|
||||||
@@ -218,7 +218,7 @@ type ProductsInPromotionParams struct {
|
|||||||
Limit float64 `json:"limit"`
|
Limit float64 `json:"limit"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset float64 `json:"offset"`
|
Offset float64 `json:"offset,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductsInPromotionResponse struct {
|
type ProductsInPromotionResponse struct {
|
||||||
@@ -355,7 +355,7 @@ type ProductsAvailableForHotSalePromotionParams struct {
|
|||||||
Limit float64 `json:"limit"`
|
Limit float64 `json:"limit"`
|
||||||
|
|
||||||
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
// Number of elements that will be skipped in the response. For example, if offset=10, the response will start with the 11th element found
|
||||||
Offset float64 `json:"offset"`
|
Offset float64 `json:"offset,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductsAvailableForHotSalePromotionResponse struct {
|
type ProductsAvailableForHotSalePromotionResponse struct {
|
||||||
|
|||||||
@@ -18,6 +18,11 @@ type GetCurrentSellerRatingInfoResponse struct {
|
|||||||
// Rating groups list
|
// Rating groups list
|
||||||
Groups []GetCurrentSellerRatingInfoGroup `json:"groups"`
|
Groups []GetCurrentSellerRatingInfoGroup `json:"groups"`
|
||||||
|
|
||||||
|
// Localization index details.
|
||||||
|
// If you had no sales in the last 14 days,
|
||||||
|
// the parameter fields will be empty
|
||||||
|
LocalizationIndex []LocalizationIndex `json:"localization_index"`
|
||||||
|
|
||||||
// An indication that the penalty points balance is exceeded
|
// An indication that the penalty points balance is exceeded
|
||||||
PenaltyScoreExceeded bool `json:"penalty_score_exceeded"`
|
PenaltyScoreExceeded bool `json:"penalty_score_exceeded"`
|
||||||
|
|
||||||
@@ -25,6 +30,14 @@ type GetCurrentSellerRatingInfoResponse struct {
|
|||||||
Premium bool `json:"premium"`
|
Premium bool `json:"premium"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type LocalizationIndex struct {
|
||||||
|
// Date of localization index calculation
|
||||||
|
CalculationDate time.Time `json:"calculation_date"`
|
||||||
|
|
||||||
|
// Localization index value
|
||||||
|
LocalizationPercentage int32 `json:"localization_percentage"`
|
||||||
|
}
|
||||||
|
|
||||||
type GetCurrentSellerRatingInfoGroup struct {
|
type GetCurrentSellerRatingInfoGroup struct {
|
||||||
// Ratings group name
|
// Ratings group name
|
||||||
GroupName string `json:"group_name"`
|
GroupName string `json:"group_name"`
|
||||||
|
|||||||
@@ -41,6 +41,12 @@ func TestGetCurrentRatingInfo(t *testing.T) {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"localization_index": [
|
||||||
|
{
|
||||||
|
"calculation_date": "2019-08-24T14:15:22Z",
|
||||||
|
"localization_percentage": 0
|
||||||
|
}
|
||||||
|
],
|
||||||
"penalty_score_exceeded": true,
|
"penalty_score_exceeded": true,
|
||||||
"premium": true
|
"premium": true
|
||||||
}`,
|
}`,
|
||||||
|
|||||||
@@ -450,7 +450,7 @@ func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParam
|
|||||||
|
|
||||||
type GetReturnsReportParams struct {
|
type GetReturnsReportParams struct {
|
||||||
// Filter
|
// Filter
|
||||||
Filter GetReturnsReportsFilter `json:"filter"`
|
Filter *GetReturnsReportsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Default: "DEFAULT"
|
// Default: "DEFAULT"
|
||||||
// Response language:
|
// Response language:
|
||||||
@@ -501,7 +501,7 @@ func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams)
|
|||||||
|
|
||||||
type GetShipmentReportParams struct {
|
type GetShipmentReportParams struct {
|
||||||
// Filter
|
// Filter
|
||||||
Filter GetShipmentReportFilter `json:"filter"`
|
Filter *GetShipmentReportFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Default: "DEFAULT"
|
// Default: "DEFAULT"
|
||||||
// Response language:
|
// Response language:
|
||||||
@@ -526,10 +526,10 @@ type GetShipmentReportFilter struct {
|
|||||||
OfferId string `json:"offer_id"`
|
OfferId string `json:"offer_id"`
|
||||||
|
|
||||||
// Order processing start date and time
|
// Order processing start date and time
|
||||||
ProcessedAtFrom time.Time `json:"processed_at_from"`
|
ProcessedAtFrom *core.TimeFormat `json:"processed_at_from,omitempty"`
|
||||||
|
|
||||||
// Time when the order appeared in your personal account
|
// Time when the order appeared in your personal account
|
||||||
ProcessedAtTo time.Time `json:"processed_at_to"`
|
ProcessedAtTo *core.TimeFormat `json:"processed_at_to,omitempty"`
|
||||||
|
|
||||||
// Product identifier in the Ozon system, SKU
|
// Product identifier in the Ozon system, SKU
|
||||||
SKU []int64 `json:"sku"`
|
SKU []int64 `json:"sku"`
|
||||||
|
|||||||
@@ -375,7 +375,7 @@ func TestGetReturnsReport(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"},
|
||||||
&GetReturnsReportParams{
|
&GetReturnsReportParams{
|
||||||
Filter: GetReturnsReportsFilter{
|
Filter: &GetReturnsReportsFilter{
|
||||||
DeliverySchema: "fbs",
|
DeliverySchema: "fbs",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -435,10 +435,10 @@ func TestGetShipmentReport(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"},
|
||||||
&GetShipmentReportParams{
|
&GetShipmentReportParams{
|
||||||
Filter: GetShipmentReportFilter{
|
Filter: &GetShipmentReportFilter{
|
||||||
DeliverySchema: []string{"fbs", "fbo", "crossborder"},
|
DeliverySchema: []string{"fbs", "fbo", "crossborder"},
|
||||||
ProcessedAtFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"),
|
ProcessedAtFrom: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
|
||||||
ProcessedAtTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"),
|
ProcessedAtTo: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
`{
|
`{
|
||||||
|
|||||||
357
ozon/returns.go
357
ozon/returns.go
@@ -14,7 +14,7 @@ type Returns struct {
|
|||||||
|
|
||||||
type GetFBOReturnsParams struct {
|
type GetFBOReturnsParams struct {
|
||||||
// Filter
|
// Filter
|
||||||
Filter GetFBOReturnsFilter `json:"filter"`
|
Filter *GetFBOReturnsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Identifier of the last value on the page. Leave this field blank in the first request.
|
// Identifier of the last value on the page. Leave this field blank in the first request.
|
||||||
//
|
//
|
||||||
@@ -56,7 +56,7 @@ type GetFBOReturnsReturn struct {
|
|||||||
// Return destination
|
// Return destination
|
||||||
DestinationPlaceName string `json:"dst_place_name"`
|
DestinationPlaceName string `json:"dst_place_name"`
|
||||||
|
|
||||||
// Return identifier
|
// Return shipment identifier
|
||||||
Id int64 `json:"id"`
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
// Indication that the package has been opened. true, if it has been
|
// Indication that the package has been opened. true, if it has been
|
||||||
@@ -65,6 +65,9 @@ type GetFBOReturnsReturn struct {
|
|||||||
// Shipment number
|
// Shipment number
|
||||||
PostingNumber string `json:"posting_number"`
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
|
// Unique return record identifier
|
||||||
|
ReturnId int64 `json:"return_id"`
|
||||||
|
|
||||||
// Return reason
|
// Return reason
|
||||||
ReturnReasonName string `json:"return_reason_name"`
|
ReturnReasonName string `json:"return_reason_name"`
|
||||||
|
|
||||||
@@ -95,7 +98,7 @@ func (c Returns) GetFBOReturns(ctx context.Context, params *GetFBOReturnsParams)
|
|||||||
|
|
||||||
type GetFBSReturnsParams struct {
|
type GetFBSReturnsParams struct {
|
||||||
// Filter
|
// Filter
|
||||||
Filter GetFBSReturnsFilter `json:"filter"`
|
Filter *GetFBSReturnsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Number of values in the response:
|
// Number of values in the response:
|
||||||
// - maximum — 1000,
|
// - maximum — 1000,
|
||||||
@@ -109,9 +112,6 @@ type GetFBSReturnsParams struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GetFBSReturnsFilter struct {
|
type GetFBSReturnsFilter struct {
|
||||||
// Time of receiving the return from the customer
|
|
||||||
AcceptedFromCustomerMoment GetFBSReturnsFilterTimeRange `json:"accepted_from_customer_moment"`
|
|
||||||
|
|
||||||
// Last day of free storage
|
// Last day of free storage
|
||||||
LastFreeWaitingDay GetFBSReturnsFilterTimeRange `json:"last_free_waiting_dat"`
|
LastFreeWaitingDay GetFBSReturnsFilterTimeRange `json:"last_free_waiting_dat"`
|
||||||
|
|
||||||
@@ -160,9 +160,6 @@ type GetFBSReturnsResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GetFBSReturnResultReturn struct {
|
type GetFBSReturnResultReturn struct {
|
||||||
// Time of receiving the return from the customer
|
|
||||||
AcceptedFromCustomerMoment string `json:"accepted_from_customer_moment"`
|
|
||||||
|
|
||||||
// Bottom barcode on the product label
|
// Bottom barcode on the product label
|
||||||
ClearingId int64 `json:"clearing_id"`
|
ClearingId int64 `json:"clearing_id"`
|
||||||
|
|
||||||
@@ -190,7 +187,7 @@ type GetFBSReturnResultReturn struct {
|
|||||||
// ID of the warehouse the product is being transported to
|
// ID of the warehouse the product is being transported to
|
||||||
PlaceId int64 `json:"place_id"`
|
PlaceId int64 `json:"place_id"`
|
||||||
|
|
||||||
// Name of the warehouse the product is being transported to
|
// Intermediate return point
|
||||||
MovingToPlaceName string `json:"moving_to_place_name"`
|
MovingToPlaceName string `json:"moving_to_place_name"`
|
||||||
|
|
||||||
// Delivery cost
|
// Delivery cost
|
||||||
@@ -207,7 +204,7 @@ type GetFBSReturnResultReturn struct {
|
|||||||
// Product price without commission
|
// Product price without commission
|
||||||
PriceWithoutCommission float64 `json:"price_without_commission"`
|
PriceWithoutCommission float64 `json:"price_without_commission"`
|
||||||
|
|
||||||
// Product identifier
|
// Product identifier — SKU
|
||||||
ProductId int64 `json:"product_id"`
|
ProductId int64 `json:"product_id"`
|
||||||
|
|
||||||
// Product name
|
// Product name
|
||||||
@@ -264,7 +261,7 @@ func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams)
|
|||||||
|
|
||||||
type GetRFBSReturnsParams struct {
|
type GetRFBSReturnsParams struct {
|
||||||
// Filter
|
// Filter
|
||||||
Filter GetRFBSReturnsFilter `json:"filter"`
|
Filter *GetRFBSReturnsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Identifier of the last value on the page.
|
// Identifier of the last value on the page.
|
||||||
// Leave this field blank in the first request
|
// Leave this field blank in the first request
|
||||||
@@ -667,7 +664,7 @@ func (c Returns) IsGiveoutEnabled(ctx context.Context) (*IsGiveoutEnabledRespons
|
|||||||
|
|
||||||
resp := &IsGiveoutEnabledResponse{}
|
resp := &IsGiveoutEnabledResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -697,7 +694,7 @@ func (c Returns) GetGiveoutPDF(ctx context.Context) (*GetGiveoutResponse, error)
|
|||||||
|
|
||||||
resp := &GetGiveoutResponse{}
|
resp := &GetGiveoutResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -714,7 +711,7 @@ func (c Returns) GetGiveoutPNG(ctx context.Context) (*GetGiveoutResponse, error)
|
|||||||
|
|
||||||
resp := &GetGiveoutResponse{}
|
resp := &GetGiveoutResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -739,7 +736,7 @@ func (c Returns) GetGiveoutBarcode(ctx context.Context) (*GetGiveoutBarcodeRespo
|
|||||||
|
|
||||||
resp := &GetGiveoutBarcodeResponse{}
|
resp := &GetGiveoutBarcodeResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -758,7 +755,7 @@ func (c Returns) ResetGiveoutBarcode(ctx context.Context) (*GetGiveoutResponse,
|
|||||||
|
|
||||||
resp := &GetGiveoutResponse{}
|
resp := &GetGiveoutResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -814,7 +811,7 @@ func (c Returns) GetGiveoutList(ctx context.Context, params *GetGiveoutListParam
|
|||||||
|
|
||||||
resp := &GetGiveoutListResponse{}
|
resp := &GetGiveoutListResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -867,7 +864,329 @@ func (c Returns) GetGiveoutInfo(ctx context.Context, params *GetGiveoutInfoParam
|
|||||||
|
|
||||||
resp := &GetGiveoutInfoResponse{}
|
resp := &GetGiveoutInfoResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
response.CopyCommonResponse(&resp.CommonResponse)
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityReturnsParams struct {
|
||||||
|
Filter GetFBSQuantityReturnsFilter `json:"filter"`
|
||||||
|
|
||||||
|
// Split the method response
|
||||||
|
Pagination GetFBSQuantityReturnsPagination `json:"pagination"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityReturnsFilter struct {
|
||||||
|
// Filter by drop-off point identifier
|
||||||
|
PlaceId int64 `json:"place_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityReturnsPagination struct {
|
||||||
|
// Identifier of the last drop-off point on the page. Leave this field blank in the first request.
|
||||||
|
//
|
||||||
|
// To get the next values, specify id of the last drop-off point from the response of the previous request
|
||||||
|
LastId int64 `json:"last_id"`
|
||||||
|
|
||||||
|
// Number of drop-off points per page. Maximum is 500
|
||||||
|
Limit int32 `json:"limit"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityReturnsResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Seller identifier
|
||||||
|
CompanyId int64 `json:"company_id"`
|
||||||
|
|
||||||
|
DropoffPoints []GetFBSQuantityDropoffPoint `json:"drop_off_points"`
|
||||||
|
|
||||||
|
// true if there are any other points where sellers have orders waiting
|
||||||
|
HasNext bool `json:"has_next"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityDropoffPoint struct {
|
||||||
|
// Drop-off point address
|
||||||
|
Address string `json:"address"`
|
||||||
|
|
||||||
|
// Drop-off point identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
|
// Drop-off point name
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Pass information
|
||||||
|
PassInfo GetFBSQuantityDropoffPointPassInfo `json:"pass_info"`
|
||||||
|
|
||||||
|
// The warehouse identifier to which the shipment will arrive
|
||||||
|
PlaceId int64 `json:"place_id"`
|
||||||
|
|
||||||
|
// Quantity of returns at the drop-off point
|
||||||
|
ReturnsCount int32 `json:"returns_count"`
|
||||||
|
|
||||||
|
// Seller's warehouses identifiers
|
||||||
|
WarehouseIds []string `json:"warehouses_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFBSQuantityDropoffPointPassInfo struct {
|
||||||
|
// Quantity of drop-off point passes
|
||||||
|
Count int32 `json:"count"`
|
||||||
|
|
||||||
|
// true if you need a pass to the drop-off point
|
||||||
|
IsRequired bool `json:"is_required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Returns) FBSQuantity(ctx context.Context, params *GetFBSQuantityReturnsParams) (*GetFBSQuantityReturnsResponse, error) {
|
||||||
|
url := "/v1/returns/company/fbs/info"
|
||||||
|
|
||||||
|
resp := &GetFBSQuantityReturnsResponse{}
|
||||||
|
|
||||||
|
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 ListReturnsParams struct {
|
||||||
|
// Filter
|
||||||
|
Filter *ListReturnsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
|
// Number of loaded returns. The maximum value is 500
|
||||||
|
Limit int32 `json:"limit"`
|
||||||
|
|
||||||
|
// Identifier of the last loaded return
|
||||||
|
LastId int64 `json:"last_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListReturnsFilter struct {
|
||||||
|
// Filter by return creation date
|
||||||
|
LogisticReturnDate *GetFBSReturnsFilterTimeRange `json:"logistic_return_date"`
|
||||||
|
|
||||||
|
// Filter by storage fees start date
|
||||||
|
StorageTarifficationDate *GetFBSReturnsFilterTimeRange `json:"storage_tariffication_start_date"`
|
||||||
|
|
||||||
|
// Filter by date the return status changed
|
||||||
|
VisualStatusChangeMoment *GetFBSReturnsFilterTimeRange `json:"visual_status_change_moment"`
|
||||||
|
|
||||||
|
// Filter by order identifier
|
||||||
|
OrderId int64 `json:"order_id,omitempty"`
|
||||||
|
|
||||||
|
// Filter by shipment number
|
||||||
|
PostingNumbers []string `json:"posting_numbers,omitempty"`
|
||||||
|
|
||||||
|
// Filter by product name
|
||||||
|
ProductName string `json:"product_name,omitempty"`
|
||||||
|
|
||||||
|
// Filter by product identifier in the seller's system
|
||||||
|
OfferId string `json:"offer_id,omitempty"`
|
||||||
|
|
||||||
|
// Filter by return status
|
||||||
|
VisualStatusName VisualStatus `json:"visual_status_name,omitempty"`
|
||||||
|
|
||||||
|
// Filter by warehouse identifier
|
||||||
|
WarehouseId int64 `json:"warehouse_id,omitempty"`
|
||||||
|
|
||||||
|
// Filter by return label barcode
|
||||||
|
Barcode string `json:"barcode,omitempty"`
|
||||||
|
|
||||||
|
// Filter by delivery scheme: FBS or FBO
|
||||||
|
ReturnSchema string `json:"return_schema,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListReturnsResponse struct {
|
||||||
|
core.CommonResponse
|
||||||
|
|
||||||
|
// Returns details
|
||||||
|
Returns []Return `json:"returns"`
|
||||||
|
|
||||||
|
// true, if the seller has other returns
|
||||||
|
HasNext bool `json:"has_next"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Return struct {
|
||||||
|
// Product items data
|
||||||
|
Exemplars []ReturnExemplar `json:"exemplars"`
|
||||||
|
|
||||||
|
// Return identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
|
// Company identifier
|
||||||
|
CompanyId int64 `json:"company_id"`
|
||||||
|
|
||||||
|
// Return reason
|
||||||
|
ReturnReasonName string `json:"return_reason_name"`
|
||||||
|
|
||||||
|
// Return type
|
||||||
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
// Return scheme
|
||||||
|
Schema string `json:"schema"`
|
||||||
|
|
||||||
|
// Order identifier
|
||||||
|
OrderId int64 `json:"order_id"`
|
||||||
|
|
||||||
|
// Order number
|
||||||
|
OrderNumber string `json:"order_number"`
|
||||||
|
|
||||||
|
// Warehouse where the return is stored
|
||||||
|
Place ReturnPlace `json:"place"`
|
||||||
|
|
||||||
|
// Warehouse where returns are sent to
|
||||||
|
TargetPlace ReturnPlace `json:"target_place"`
|
||||||
|
|
||||||
|
// Storage details
|
||||||
|
Storage ReturnStorage `json:"storage"`
|
||||||
|
|
||||||
|
// Product details
|
||||||
|
Product ReturnProduct `json:"product"`
|
||||||
|
|
||||||
|
// Return details
|
||||||
|
Logistic ReturnLogistic `json:"logistic"`
|
||||||
|
|
||||||
|
// Return status details
|
||||||
|
Visual ReturnVisual `json:"visual"`
|
||||||
|
|
||||||
|
// Additional information
|
||||||
|
AdditionalInfo ReturnAdditionalInfo `json:"additional_info"`
|
||||||
|
|
||||||
|
// Previous return identifier
|
||||||
|
SourceId int64 `json:"source_id"`
|
||||||
|
|
||||||
|
// Shipment number
|
||||||
|
PostingNumber string `json:"posting_number"`
|
||||||
|
|
||||||
|
// Original shipment barcode
|
||||||
|
ClearingId int64 `json:"clearing_id"`
|
||||||
|
|
||||||
|
// Package unit identifier in the Ozon logistics system
|
||||||
|
ReturnClearingId int64 `json:"return_clearing_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnExemplar struct {
|
||||||
|
// Product identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnPlace struct {
|
||||||
|
// Warehouse identifier
|
||||||
|
Id int64 `json:"id"`
|
||||||
|
|
||||||
|
// Warehouse name
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Warehouse address
|
||||||
|
Address string `json:"address"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnStorage struct {
|
||||||
|
// Storage cost details
|
||||||
|
Sum ReturnSum `json:"sum"`
|
||||||
|
|
||||||
|
// First day of charging for storage
|
||||||
|
TarifficationsFirstDate time.Time `json:"tariffication_first_date"`
|
||||||
|
|
||||||
|
// Start date for storage fees
|
||||||
|
TarifficationsStartDate time.Time `json:"tariffication_start_date"`
|
||||||
|
|
||||||
|
// Date when the return was ready for handover
|
||||||
|
ArrivedMoment time.Time `json:"arrived_moment"`
|
||||||
|
|
||||||
|
// Number of days the return has been waiting for handover
|
||||||
|
Days int64 `json:"days"`
|
||||||
|
|
||||||
|
// Disposal cost details
|
||||||
|
UtilizationSum ReturnSum `json:"utilization_sum"`
|
||||||
|
|
||||||
|
// Planned disposal date
|
||||||
|
UtilizationForecastDate string `json:"utilization_forecast_date"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnSum struct {
|
||||||
|
// Currency
|
||||||
|
CurrencyCode string `json:"currency_code"`
|
||||||
|
|
||||||
|
// Disposal cost
|
||||||
|
Price float64 `json:"price"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnProduct struct {
|
||||||
|
// Product identifier in the Ozon system, SKU
|
||||||
|
SKU int64 `json:"sku"`
|
||||||
|
|
||||||
|
// Product identifier in the seller's system
|
||||||
|
OfferId string `json:"offer_id"`
|
||||||
|
|
||||||
|
// product name
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Product price details
|
||||||
|
Price ReturnSum `json:"price"`
|
||||||
|
|
||||||
|
// Product cost without commission
|
||||||
|
PriceWithoutCommission ReturnSum `json:"price_without_commission"`
|
||||||
|
|
||||||
|
// Sales commission by category
|
||||||
|
CommissionPercent float64 `json:"commission_percent"`
|
||||||
|
|
||||||
|
// Commission details
|
||||||
|
Commission ReturnSum `json:"commission"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnLogistic struct {
|
||||||
|
// Date when the order was placed for technical return
|
||||||
|
TechnicalReturnMoment time.Time `json:"technical_return_moment"`
|
||||||
|
|
||||||
|
// Date when the return arrived to the warehouse or was handed over to the seller
|
||||||
|
FinalMoment time.Time `json:"final_moment"`
|
||||||
|
|
||||||
|
// Date when the seller received compensation for the return
|
||||||
|
CancelledWithCompensationMoment time.Time `json:"cancelled_with_compensation_moment"`
|
||||||
|
|
||||||
|
// Date when the customer returned the product
|
||||||
|
ReturnDate time.Time `json:"return_date"`
|
||||||
|
|
||||||
|
// Return label barcode
|
||||||
|
Barcode string `json:"barcode"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnVisual struct {
|
||||||
|
// Return status
|
||||||
|
Status ReturnVisualStatus `json:"status"`
|
||||||
|
|
||||||
|
// Date the return status changed
|
||||||
|
ChangeMoment time.Time `json:"change_moment"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnVisualStatus struct {
|
||||||
|
// Return status identifier
|
||||||
|
Id int32 `json:"id"`
|
||||||
|
|
||||||
|
// Return status name
|
||||||
|
DisplayName string `json:"display_name"`
|
||||||
|
|
||||||
|
// System name of the return status
|
||||||
|
SystemName string `json:"sys_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnAdditionalInfo struct {
|
||||||
|
// true, if the return package is opened
|
||||||
|
IsOpened bool `json:"is_opened"`
|
||||||
|
|
||||||
|
// true, if the return belongs to Super Economy products
|
||||||
|
IsSuperEconom bool `json:"is_super_econom"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Returns) List(ctx context.Context, params *ListReturnsParams) (*ListReturnsResponse, error) {
|
||||||
|
url := "/v1/returns/list"
|
||||||
|
|
||||||
|
resp := &ListReturnsResponse{}
|
||||||
|
|
||||||
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ func TestGetFBOReturns(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"},
|
||||||
&GetFBOReturnsParams{
|
&GetFBOReturnsParams{
|
||||||
Filter: GetFBOReturnsFilter{
|
Filter: &GetFBOReturnsFilter{
|
||||||
PostingNumber: "some number",
|
PostingNumber: "some number",
|
||||||
},
|
},
|
||||||
LastId: 123,
|
LastId: 123,
|
||||||
@@ -105,7 +105,7 @@ func TestGetFBSReturns(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"},
|
||||||
&GetFBSReturnsParams{
|
&GetFBSReturnsParams{
|
||||||
Filter: GetFBSReturnsFilter{
|
Filter: &GetFBSReturnsFilter{
|
||||||
PostingNumber: []string{"07402477-0022-2"},
|
PostingNumber: []string{"07402477-0022-2"},
|
||||||
Status: "returned_to_seller",
|
Status: "returned_to_seller",
|
||||||
},
|
},
|
||||||
@@ -116,7 +116,6 @@ func TestGetFBSReturns(t *testing.T) {
|
|||||||
"last_id": 0,
|
"last_id": 0,
|
||||||
"returns": [
|
"returns": [
|
||||||
{
|
{
|
||||||
"accepted_from_customer_moment": "string",
|
|
||||||
"clearing_id": 23,
|
"clearing_id": 23,
|
||||||
"commission": 21,
|
"commission": 21,
|
||||||
"commission_percent": 0,
|
"commission_percent": 0,
|
||||||
@@ -212,7 +211,7 @@ func TestGetRFBSReturns(t *testing.T) {
|
|||||||
&GetRFBSReturnsParams{
|
&GetRFBSReturnsParams{
|
||||||
LastId: 999,
|
LastId: 999,
|
||||||
Limit: 555,
|
Limit: 555,
|
||||||
Filter: GetRFBSReturnsFilter{
|
Filter: &GetRFBSReturnsFilter{
|
||||||
OfferId: "123",
|
OfferId: "123",
|
||||||
PostingNumber: "111",
|
PostingNumber: "111",
|
||||||
GroupState: []RFBSReturnsGroupState{RFBSReturnsGroupStateAll},
|
GroupState: []RFBSReturnsGroupState{RFBSReturnsGroupStateAll},
|
||||||
@@ -987,3 +986,226 @@ func TestGetGiveoutInfo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFBSQuantity(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *GetFBSQuantityReturnsParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&GetFBSQuantityReturnsParams{
|
||||||
|
Filter: GetFBSQuantityReturnsFilter{
|
||||||
|
PlaceId: 1,
|
||||||
|
},
|
||||||
|
Pagination: GetFBSQuantityReturnsPagination{
|
||||||
|
LastId: 2,
|
||||||
|
Limit: 3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"company_id": 0,
|
||||||
|
"drop_off_points": [
|
||||||
|
{
|
||||||
|
"address": "string",
|
||||||
|
"id": 0,
|
||||||
|
"name": "string",
|
||||||
|
"pass_info": {
|
||||||
|
"count": 0,
|
||||||
|
"is_required": true
|
||||||
|
},
|
||||||
|
"place_id": 0,
|
||||||
|
"returns_count": 0,
|
||||||
|
"warehouses_ids": [
|
||||||
|
"string"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"has_next": true
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&GetFBSQuantityReturnsParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Returns().FBSQuantity(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &GetFBSQuantityReturnsResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestListReturns(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
statusCode int
|
||||||
|
headers map[string]string
|
||||||
|
params *ListReturnsParams
|
||||||
|
response string
|
||||||
|
}{
|
||||||
|
// Test Ok
|
||||||
|
{
|
||||||
|
http.StatusOK,
|
||||||
|
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||||
|
&ListReturnsParams{
|
||||||
|
Filter: &ListReturnsFilter{
|
||||||
|
LogisticReturnDate: &GetFBSReturnsFilterTimeRange{
|
||||||
|
TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
TimeTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
},
|
||||||
|
StorageTarifficationDate: &GetFBSReturnsFilterTimeRange{
|
||||||
|
TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
TimeTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
},
|
||||||
|
VisualStatusChangeMoment: &GetFBSReturnsFilterTimeRange{
|
||||||
|
TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
TimeTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
|
||||||
|
},
|
||||||
|
WarehouseId: 911,
|
||||||
|
ReturnSchema: "FBO",
|
||||||
|
ProductName: "string",
|
||||||
|
},
|
||||||
|
Limit: 500,
|
||||||
|
LastId: 0,
|
||||||
|
},
|
||||||
|
`{
|
||||||
|
"returns": [
|
||||||
|
{
|
||||||
|
"exemplars": [
|
||||||
|
{
|
||||||
|
"id": 1019562967545956
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"id": 1000015552,
|
||||||
|
"company_id": 3058,
|
||||||
|
"return_reason_name": "Customer refused on receipt: not satisfied with the quality of the product",
|
||||||
|
"type": "FullReturn",
|
||||||
|
"schema": "Fbs",
|
||||||
|
"order_id": 24540784250,
|
||||||
|
"order_number": "58544282-0057",
|
||||||
|
"place": {
|
||||||
|
"id": 23869688194000,
|
||||||
|
"name": "СЦ_Львовский_Возвраты",
|
||||||
|
"address": "Россия, обл. Московская, г. Подольск, промышленная зона Львовский, ул. Московская, д. 69, стр. 5"
|
||||||
|
},
|
||||||
|
"target_place": {
|
||||||
|
"id": 23869688194000,
|
||||||
|
"name": "СЦ_Львовский_Возвраты",
|
||||||
|
"address": "Россия, обл. Московская, г. Подольск, промышленная зона Львовский, ул. Московская, д. 69, стр. 5"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"sum": {
|
||||||
|
"currency_code": "RUB",
|
||||||
|
"price": 1231
|
||||||
|
},
|
||||||
|
"tariffication_first_date": "2024-07-30T06:15:48.998146Z",
|
||||||
|
"tariffication_start_date": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"arrived_moment": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"days": 0,
|
||||||
|
"utilization_sum": {
|
||||||
|
"currency_code": "RUB",
|
||||||
|
"price": 1231
|
||||||
|
},
|
||||||
|
"utilization_forecast_date": "2024-07-29T06:15:48.998146Z"
|
||||||
|
},
|
||||||
|
"product": {
|
||||||
|
"sku": 1100526203,
|
||||||
|
"offer_id": "81451",
|
||||||
|
"name": "Кукла Дотти Плачущий младенец Cry Babies Dressy Dotty",
|
||||||
|
"price": {
|
||||||
|
"currency_code": "RUB",
|
||||||
|
"price": 3318
|
||||||
|
},
|
||||||
|
"price_without_commission": {
|
||||||
|
"currency_code": "RUB",
|
||||||
|
"price": 3318
|
||||||
|
},
|
||||||
|
"commission_percent": 1.2,
|
||||||
|
"commission": {
|
||||||
|
"currency_code": "RUB",
|
||||||
|
"price": 2312
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"logistic": {
|
||||||
|
"technical_return_moment": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"final_moment": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"cancelled_with_compensation_moment": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"return_date": "2024-07-29T06:15:48.998146Z",
|
||||||
|
"barcode": "ii5275210303"
|
||||||
|
},
|
||||||
|
"visual": {
|
||||||
|
"status": {
|
||||||
|
"id": 3,
|
||||||
|
"display_name": "At the pick-up point",
|
||||||
|
"sys_name": "ArrivedAtReturnPlace"
|
||||||
|
},
|
||||||
|
"change_moment": "2024-07-29T06:15:48.998146Z"
|
||||||
|
},
|
||||||
|
"additional_info": {
|
||||||
|
"is_opened": true,
|
||||||
|
"is_super_econom": false
|
||||||
|
},
|
||||||
|
"source_id": 90426223,
|
||||||
|
"posting_number": "58544282-0057-1",
|
||||||
|
"clearing_id": 21190893156000,
|
||||||
|
"return_clearing_id": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"has_next": false
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
// Test No Client-Id or Api-Key
|
||||||
|
{
|
||||||
|
http.StatusUnauthorized,
|
||||||
|
map[string]string{},
|
||||||
|
&ListReturnsParams{},
|
||||||
|
`{
|
||||||
|
"code": 16,
|
||||||
|
"message": "Client-Id and Api-Key headers are required"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||||
|
|
||||||
|
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
resp, err := c.Returns().List(ctx, test.params)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
compareJsonResponse(t, test.response, &ListReturnsResponse{})
|
||||||
|
|
||||||
|
if resp.StatusCode != test.statusCode {
|
||||||
|
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -377,6 +377,7 @@ type GetCompetitorPriceResult struct {
|
|||||||
StrategyCompetitorProductURL string `json:"strategy_competitor_product_url"`
|
StrategyCompetitorProductURL string `json:"strategy_competitor_product_url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If you add a product to your pricing strategy, the method returns you the price and a link to the competitor's product
|
||||||
func (c Strategies) GetCompetitorPrice(ctx context.Context, params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
|
func (c Strategies) GetCompetitorPrice(ctx context.Context, params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
|
||||||
url := "/v1/pricing-strategy/product/info"
|
url := "/v1/pricing-strategy/product/info"
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehous
|
|||||||
|
|
||||||
type GetListOfDeliveryMethodsParams struct {
|
type GetListOfDeliveryMethodsParams struct {
|
||||||
// Search filter for delivery methods
|
// Search filter for delivery methods
|
||||||
Filter GetListOfDeliveryMethodsFilter `json:"filter"`
|
Filter *GetListOfDeliveryMethodsFilter `json:"filter,omitempty"`
|
||||||
|
|
||||||
// Number of items in a response. Maximum is 50, minimum is 1
|
// Number of items in a response. Maximum is 50, minimum is 1
|
||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
@@ -181,7 +181,7 @@ func (c Warehouses) GetListOfDeliveryMethods(ctx context.Context, params *GetLis
|
|||||||
|
|
||||||
resp := &GetListOfDeliveryMethodsResponse{}
|
resp := &GetListOfDeliveryMethodsResponse{}
|
||||||
|
|
||||||
response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
|
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,24 +23,34 @@ func TestGetListOfWarehouses(t *testing.T) {
|
|||||||
`{
|
`{
|
||||||
"result": [
|
"result": [
|
||||||
{
|
{
|
||||||
"warehouse_id": 15588127982000,
|
"warehouse_id": 1020000177886000,
|
||||||
"name": "Proffi (Панорама Групп)",
|
"name": "This is a test",
|
||||||
"is_rfbs": false
|
"is_rfbs": false,
|
||||||
|
"has_entrusted_acceptance": false,
|
||||||
|
"first_mile_type": {
|
||||||
|
"dropoff_point_id": "",
|
||||||
|
"dropoff_timeslot_id": 0,
|
||||||
|
"first_mile_is_changing": false,
|
||||||
|
"first_mile_type": ""
|
||||||
},
|
},
|
||||||
{
|
"is_kgt": false,
|
||||||
"warehouse_id": 22142605386000,
|
"can_print_act_in_advance": false,
|
||||||
"name": "Склад на производственной",
|
"min_working_days": 5,
|
||||||
"is_rfbs": true
|
"is_karantin": false,
|
||||||
},
|
"has_postings_limit": false,
|
||||||
{
|
"postings_limit": -1,
|
||||||
"warehouse_id": 22208673494000,
|
"working_days": [
|
||||||
"name": "Тест 37349",
|
1,
|
||||||
"is_rfbs": true
|
2,
|
||||||
},
|
3,
|
||||||
{
|
4,
|
||||||
"warehouse_id": 22240462819000,
|
5,
|
||||||
"name": "Тест12",
|
6,
|
||||||
"is_rfbs": true
|
7
|
||||||
|
],
|
||||||
|
"min_postings_limit": 10,
|
||||||
|
"is_timetable_editable": true,
|
||||||
|
"status": "disabled"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}`,
|
}`,
|
||||||
@@ -99,7 +109,7 @@ func TestGetListOfDeliveryMethods(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"},
|
||||||
&GetListOfDeliveryMethodsParams{
|
&GetListOfDeliveryMethodsParams{
|
||||||
Filter: GetListOfDeliveryMethodsFilter{
|
Filter: &GetListOfDeliveryMethodsFilter{
|
||||||
WarehouseId: 15588127982000,
|
WarehouseId: 15588127982000,
|
||||||
},
|
},
|
||||||
Limit: 100,
|
Limit: 100,
|
||||||
|
|||||||
Reference in New Issue
Block a user