From 908f16b173ca721ef99d2fdb273d36c62f90a3e7 Mon Sep 17 00:00:00 2001 From: Pavel Tsayukov Date: Tue, 18 Feb 2025 14:28:04 +0300 Subject: [PATCH 1/4] Fix wrong name of query key for OrderExternalIds field --- filters.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filters.go b/filters.go index 1f29214..13141e0 100644 --- a/filters.go +++ b/filters.go @@ -396,7 +396,7 @@ type CostsFilter struct { CreatedAtFrom string `url:"createdAtFrom,omitempty"` CreatedAtTo string `url:"createdAtTo,omitempty"` OrderIds []string `url:"orderIds,omitempty,brackets"` - OrderExternalIds []string `url:"orderIds,omitempty,brackets"` + OrderExternalIds []string `url:"orderExternalIds,omitempty,brackets"` } // FilesFilter type. From 8892fe6895a57b17d25d8b745e4518313bf3c931 Mon Sep 17 00:00:00 2001 From: Pavel Tsayukov Date: Tue, 18 Feb 2025 14:29:06 +0300 Subject: [PATCH 2/4] Fix types of fields in CostsFilter --- filters.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/filters.go b/filters.go index 13141e0..99aa4ee 100644 --- a/filters.go +++ b/filters.go @@ -381,21 +381,21 @@ type ShipmentFilter struct { // CostsFilter type. type CostsFilter struct { - MinSumm string `url:"minSumm,omitempty"` - MaxSumm string `url:"maxSumm,omitempty"` + MinSumm int `url:"minSumm,omitempty"` + MaxSumm int `url:"maxSumm,omitempty"` OrderNumber string `url:"orderNumber,omitempty"` Comment string `url:"orderNumber,omitempty"` - Ids []string `url:"ids,omitempty,brackets"` + Ids []int `url:"ids,omitempty,brackets"` Sites []string `url:"sites,omitempty,brackets"` - CreatedBy []string `url:"createdBy,omitempty,brackets"` + CreatedBy []int `url:"createdBy,omitempty,brackets"` CostGroups []string `url:"costGroups,omitempty,brackets"` CostItems []string `url:"costItems,omitempty,brackets"` - Users []string `url:"users,omitempty,brackets"` + Users []int `url:"users,omitempty,brackets"` DateFrom string `url:"dateFrom,omitempty"` DateTo string `url:"dateTo,omitempty"` CreatedAtFrom string `url:"createdAtFrom,omitempty"` CreatedAtTo string `url:"createdAtTo,omitempty"` - OrderIds []string `url:"orderIds,omitempty,brackets"` + OrderIds []int `url:"orderIds,omitempty,brackets"` OrderExternalIds []string `url:"orderExternalIds,omitempty,brackets"` } From a8cae8b200512acb6459a53df578d64c8ad81bb9 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Tue, 18 Mar 2025 17:11:38 +0300 Subject: [PATCH 3/4] fix type in the tests --- client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_test.go b/client_test.go index 398be36..b50ff9f 100644 --- a/client_test.go +++ b/client_test.go @@ -6214,7 +6214,7 @@ func TestClient_Cost(t *testing.T) { costs, status, err := c.Costs(CostsRequest{ Filter: CostsFilter{ - Ids: []string{strconv.Itoa(id)}, + Ids: []int{id}, }, Limit: 20, Page: 1, From 0123057e863693c23df3f4411f3c83caa6f1ec4a Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Tue, 18 Mar 2025 17:18:06 +0300 Subject: [PATCH 4/4] fix lint issues --- client.go | 2 +- client_test.go | 2 +- filters.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client.go b/client.go index 94a13eb..e862373 100644 --- a/client.go +++ b/client.go @@ -4967,7 +4967,7 @@ func (c *Client) StaticticsUpdate() (SuccessfulResponse, int, error) { // // data, status, err := client.Costs(CostsRequest{ // Filter: CostsFilter{ -// Ids: []string{"1","2","3"}, +// IDs: []string{"1","2","3"}, // MinSumm: "1000" // }, // }) diff --git a/client_test.go b/client_test.go index b50ff9f..14d898a 100644 --- a/client_test.go +++ b/client_test.go @@ -6214,7 +6214,7 @@ func TestClient_Cost(t *testing.T) { costs, status, err := c.Costs(CostsRequest{ Filter: CostsFilter{ - Ids: []int{id}, + IDs: []int{id}, }, Limit: 20, Page: 1, diff --git a/filters.go b/filters.go index 99aa4ee..6f28c58 100644 --- a/filters.go +++ b/filters.go @@ -385,7 +385,7 @@ type CostsFilter struct { MaxSumm int `url:"maxSumm,omitempty"` OrderNumber string `url:"orderNumber,omitempty"` Comment string `url:"orderNumber,omitempty"` - Ids []int `url:"ids,omitempty,brackets"` + IDs []int `url:"ids,omitempty,brackets"` Sites []string `url:"sites,omitempty,brackets"` CreatedBy []int `url:"createdBy,omitempty,brackets"` CostGroups []string `url:"costGroups,omitempty,brackets"` @@ -395,8 +395,8 @@ type CostsFilter struct { DateTo string `url:"dateTo,omitempty"` CreatedAtFrom string `url:"createdAtFrom,omitempty"` CreatedAtTo string `url:"createdAtTo,omitempty"` - OrderIds []int `url:"orderIds,omitempty,brackets"` - OrderExternalIds []string `url:"orderExternalIds,omitempty,brackets"` + OrderIDs []int `url:"orderIds,omitempty,brackets"` + OrderExternalIDs []string `url:"orderExternalIds,omitempty,brackets"` } // FilesFilter type.