From bbc21559e9fec9118556b72d5bcb89c6afceaa62 Mon Sep 17 00:00:00 2001 From: Dzyanis Kuzmenka Date: Mon, 15 Dec 2025 22:27:18 +0100 Subject: [PATCH 1/3] split integration and unit tests --- .env.example | 2 ++ .gitignore | 1 + .golangci.yml | 7 +++++++ Makefile | 24 ++++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 .env.example create mode 100644 .gitignore create mode 100644 .golangci.yml create mode 100644 Makefile diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..b2cbe35 --- /dev/null +++ b/.env.example @@ -0,0 +1,2 @@ +DB_ID= +PRIVATE_TOKEN= \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2eea525 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env \ No newline at end of file diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..1d03c65 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,7 @@ +version: "2" + +linters: + disable-all: true + exclusions: + paths: + - examples diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..342bc6c --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +# Load environment variables from .env file if it exists +ifneq (,$(wildcard .env)) + include .env + export +endif + +# Default target +all: lint test +.PHONY: all + +# Run golangci-lint +lint: + golangci-lint run ./recombee/... +.PHONY: lint + +# Run unit-tests +test: + go test -short -v ./test +.PHONY: test + +# Run integration tests +test-integration: + DB_ID=$(DB_ID) PRIVATE_TOKEN=$(PRIVATE_TOKEN) go test -v ./test +.PHONY: test-integration \ No newline at end of file From e884290fb37e12e07c94d3419fd7a02329f4aad0 Mon Sep 17 00:00:00 2001 From: Dzyanis Kuzmenka Date: Mon, 15 Dec 2025 22:29:40 +0100 Subject: [PATCH 2/3] skip integration tests when running in short mode --- test/recombee_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/recombee_test.go b/test/recombee_test.go index 099bab3..4daa764 100644 --- a/test/recombee_test.go +++ b/test/recombee_test.go @@ -2,15 +2,16 @@ package test import ( "fmt" - "github.com/recombee/go-api-client/v6/recombee" - "github.com/recombee/go-api-client/v6/recombee/errors" - "github.com/recombee/go-api-client/v6/recombee/requests" "math/rand" "net/http" "os" "reflect" "testing" "time" + + "github.com/recombee/go-api-client/v6/recombee" + "github.com/recombee/go-api-client/v6/recombee/errors" + "github.com/recombee/go-api-client/v6/recombee/requests" ) func createClient(t *testing.T) *recombee.RecombeeClient { @@ -93,6 +94,10 @@ func numbersAreEqual(a, b reflect.Value) bool { func useVars(vars ...interface{}) {} func defaultTestSetUp(t *testing.T) { + if testing.Short() { + t.Skip("skipping integration test in short mode") + } + client := createClient(t) client.NewResetDatabase().Send() From 48185ae706b4d8390ba0e09586c04941d5944d39 Mon Sep 17 00:00:00 2001 From: Dzyanis Kuzmenka Date: Tue, 16 Dec 2025 10:58:43 +0100 Subject: [PATCH 3/3] resolve linter warnings --- .gitignore | 2 +- recombee/errors/response_error.go | 1 + recombee/recombee_client.go | 36 ++++++++++++++----- recombee/requests/add_bookmark.go | 7 ++-- recombee/requests/add_cart_addition.go | 7 ++-- recombee/requests/add_detail_view.go | 7 ++-- recombee/requests/add_item.go | 4 +-- recombee/requests/add_item_property.go | 4 +-- recombee/requests/add_manual_reql_segment.go | 4 +-- recombee/requests/add_purchase.go | 7 ++-- recombee/requests/add_rating.go | 7 ++-- recombee/requests/add_search_synonym.go | 10 +++--- recombee/requests/add_series.go | 4 +-- recombee/requests/add_user.go | 4 +-- recombee/requests/add_user_property.go | 4 +-- recombee/requests/batch.go | 7 ++-- recombee/requests/composite_recommendation.go | 10 +++--- .../requests/create_auto_reql_segmentation.go | 4 +-- .../create_manual_reql_segmentation.go | 4 +-- .../create_property_based_segmentation.go | 4 +-- .../requests/delete_all_search_synonyms.go | 7 ++-- recombee/requests/delete_bookmark.go | 7 ++-- recombee/requests/delete_cart_addition.go | 7 ++-- recombee/requests/delete_detail_view.go | 7 ++-- recombee/requests/delete_item.go | 4 +-- recombee/requests/delete_item_property.go | 4 +-- .../requests/delete_manual_reql_segment.go | 4 +-- recombee/requests/delete_more_items.go | 10 +++--- recombee/requests/delete_purchase.go | 7 ++-- recombee/requests/delete_rating.go | 7 ++-- recombee/requests/delete_search_synonym.go | 4 +-- recombee/requests/delete_segmentation.go | 4 +-- recombee/requests/delete_series.go | 4 +-- recombee/requests/delete_user.go | 4 +-- recombee/requests/delete_user_property.go | 4 +-- recombee/requests/delete_view_portion.go | 7 ++-- recombee/requests/get_item_property_info.go | 7 ++-- recombee/requests/get_item_values.go | 4 +-- recombee/requests/get_segmentation.go | 7 ++-- recombee/requests/get_user_property_info.go | 7 ++-- recombee/requests/get_user_values.go | 4 +-- recombee/requests/insert_to_series.go | 4 +-- recombee/requests/list_item_bookmarks.go | 7 ++-- recombee/requests/list_item_cart_additions.go | 7 ++-- recombee/requests/list_item_detail_views.go | 7 ++-- recombee/requests/list_item_properties.go | 10 +++--- recombee/requests/list_item_purchases.go | 7 ++-- recombee/requests/list_item_ratings.go | 7 ++-- recombee/requests/list_item_view_portions.go | 7 ++-- recombee/requests/list_items.go | 10 +++--- recombee/requests/list_scenarios.go | 10 +++--- recombee/requests/list_search_synonyms.go | 10 +++--- recombee/requests/list_segmentations.go | 10 +++--- recombee/requests/list_series.go | 10 +++--- recombee/requests/list_series_items.go | 7 ++-- recombee/requests/list_user_bookmarks.go | 7 ++-- recombee/requests/list_user_cart_additions.go | 7 ++-- recombee/requests/list_user_detail_views.go | 7 ++-- recombee/requests/list_user_properties.go | 10 +++--- recombee/requests/list_user_purchases.go | 7 ++-- recombee/requests/list_user_ratings.go | 7 ++-- recombee/requests/list_user_view_portions.go | 7 ++-- recombee/requests/list_users.go | 10 +++--- recombee/requests/merge_users.go | 4 +-- .../recommend_item_segments_to_item.go | 7 ++-- ...recommend_item_segments_to_item_segment.go | 10 +++--- .../recommend_item_segments_to_user.go | 7 ++-- recombee/requests/recommend_items_to_item.go | 7 ++-- .../recommend_items_to_item_segment.go | 10 +++--- recombee/requests/recommend_items_to_user.go | 7 ++-- recombee/requests/recommend_next_items.go | 7 ++-- recombee/requests/recommend_users_to_item.go | 7 ++-- recombee/requests/recommend_users_to_user.go | 7 ++-- recombee/requests/remove_from_series.go | 4 +-- recombee/requests/reset_database.go | 7 ++-- recombee/requests/search_item_segments.go | 7 ++-- recombee/requests/search_items.go | 7 ++-- recombee/requests/set_item_values.go | 4 +-- recombee/requests/set_user_values.go | 4 +-- recombee/requests/set_view_portion.go | 7 ++-- .../requests/update_auto_reql_segmentation.go | 4 +-- .../requests/update_manual_reql_segment.go | 4 +-- .../update_manual_reql_segmentation.go | 4 +-- recombee/requests/update_more_items.go | 10 +++--- .../update_property_based_segmentation.go | 4 +-- 85 files changed, 301 insertions(+), 270 deletions(-) diff --git a/.gitignore b/.gitignore index 2eea525..4c49bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.env \ No newline at end of file +.env diff --git a/recombee/errors/response_error.go b/recombee/errors/response_error.go index ba1971f..3aadb14 100644 --- a/recombee/errors/response_error.go +++ b/recombee/errors/response_error.go @@ -2,6 +2,7 @@ package errors import ( "fmt" + "github.com/recombee/go-api-client/v6/recombee/requests" ) diff --git a/recombee/recombee_client.go b/recombee/recombee_client.go index 1f9943b..74a38f2 100644 --- a/recombee/recombee_client.go +++ b/recombee/recombee_client.go @@ -9,8 +9,6 @@ import ( "encoding/json" "errors" "fmt" - errorspkg "github.com/recombee/go-api-client/v6/recombee/errors" - requestspkg "github.com/recombee/go-api-client/v6/recombee/requests" "io" "net" "net/http" @@ -18,6 +16,15 @@ import ( "strconv" "strings" "time" + + errorspkg "github.com/recombee/go-api-client/v6/recombee/errors" + requestspkg "github.com/recombee/go-api-client/v6/recombee/requests" +) + +var ( + ErrBothRegionAndBaseURI = errors.New("you cannot specify both region and baseUri") + ErrUnknownRegion = errors.New("unknown region specified") + ErrMissingRegionOrBaseURI = errors.New("you must specify either region or baseUri") ) // RecombeeClient is a client for interacting with the Recombee API. @@ -74,7 +81,7 @@ func NewRecombeeClientWithOptions(databaseId string, privateToken string, option if options.Region != nil { if baseUri != "" { - return nil, errors.New("You cannot specify both region and baseUri") + return nil, ErrBothRegionAndBaseURI } switch *options.Region { @@ -87,15 +94,21 @@ func NewRecombeeClientWithOptions(databaseId string, privateToken string, option case "us-west": baseUri = "rapi-us-west.recombee.com" default: - return nil, errors.New("Unknown region specified") + return nil, ErrUnknownRegion } } if baseUri == "" { - return nil, errors.New("You must specify either region or baseUri") + return nil, ErrMissingRegionOrBaseURI } - return &RecombeeClient{databaseId: databaseId, privateToken: privateToken, baseUri: baseUri, useHttpsByDefault: useHttpsByDefault, httpClient: httpClient}, nil + return &RecombeeClient{ + databaseId: databaseId, + privateToken: privateToken, + baseUri: baseUri, + useHttpsByDefault: useHttpsByDefault, + httpClient: httpClient, + }, nil } // NewRecombeeClient creates a new instance of RecombeeClient with @@ -134,7 +147,7 @@ func (c *RecombeeClient) signUrlStr(urlStr string) (string, error) { return u.String() + "&hmac_sign=" + signature, nil } -func (client *RecombeeClient) SendRequestWithContext(ctx context.Context, request *requestspkg.ApiRequest) error { +func (client *RecombeeClient) SendRequestWithContext(ctx context.Context, request *requestspkg.ApiRequest) (err error) { parsedUrl, err := url.Parse(request.Path) if err != nil { @@ -192,7 +205,12 @@ func (client *RecombeeClient) SendRequestWithContext(ctx context.Context, reques } return err } - defer response.Body.Close() + defer func() { + closeErr := response.Body.Close() + if closeErr != nil && err == nil { + err = closeErr + } + }() bodyBytes, err := io.ReadAll(response.Body) if err != nil { @@ -207,7 +225,7 @@ func (client *RecombeeClient) SendRequestWithContext(ctx context.Context, reques // Decode the response body into the target if not nil if request.Target != nil { - if err := json.Unmarshal(bodyBytes, request.Target); err != nil { + if err = json.Unmarshal(bodyBytes, request.Target); err != nil { return err } } diff --git a/recombee/requests/add_bookmark.go b/recombee/requests/add_bookmark.go index 053a29b..c1bac21 100644 --- a/recombee/requests/add_bookmark.go +++ b/recombee/requests/add_bookmark.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewAddBookmark(client ApiClient, userId string, itemId string) *AddBookmark return &AddBookmark{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/bookmarks/"), + Path: "/bookmarks/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -73,12 +72,12 @@ func (r *AddBookmark) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddBookmark) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_cart_addition.go b/recombee/requests/add_cart_addition.go index 3238430..3c4e637 100644 --- a/recombee/requests/add_cart_addition.go +++ b/recombee/requests/add_cart_addition.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewAddCartAddition(client ApiClient, userId string, itemId string) *AddCart return &AddCartAddition{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/cartadditions/"), + Path: "/cartadditions/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -87,12 +86,12 @@ func (r *AddCartAddition) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddCartAddition) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_detail_view.go b/recombee/requests/add_detail_view.go index be4a8a8..cba974a 100644 --- a/recombee/requests/add_detail_view.go +++ b/recombee/requests/add_detail_view.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewAddDetailView(client ApiClient, userId string, itemId string) *AddDetail return &AddDetailView{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/detailviews/"), + Path: "/detailviews/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -87,12 +86,12 @@ func (r *AddDetailView) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddDetailView) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_item.go b/recombee/requests/add_item.go index 3bf3876..75555f0 100644 --- a/recombee/requests/add_item.go +++ b/recombee/requests/add_item.go @@ -44,12 +44,12 @@ func (r *AddItem) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddItem) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_item_property.go b/recombee/requests/add_item_property.go index 31b2801..0bd5d93 100644 --- a/recombee/requests/add_item_property.go +++ b/recombee/requests/add_item_property.go @@ -44,12 +44,12 @@ func (r *AddItemProperty) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddItemProperty) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_manual_reql_segment.go b/recombee/requests/add_manual_reql_segment.go index 34f8eb6..2a07af6 100644 --- a/recombee/requests/add_manual_reql_segment.go +++ b/recombee/requests/add_manual_reql_segment.go @@ -53,12 +53,12 @@ func (r *AddManualReqlSegment) SendWithContext(ctx context.Context) (string, err if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddManualReqlSegment) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_purchase.go b/recombee/requests/add_purchase.go index 8f0ee92..c7f29c4 100644 --- a/recombee/requests/add_purchase.go +++ b/recombee/requests/add_purchase.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewAddPurchase(client ApiClient, userId string, itemId string) *AddPurchase return &AddPurchase{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/purchases/"), + Path: "/purchases/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -94,12 +93,12 @@ func (r *AddPurchase) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddPurchase) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_rating.go b/recombee/requests/add_rating.go index 4005f8c..f65eefc 100644 --- a/recombee/requests/add_rating.go +++ b/recombee/requests/add_rating.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -30,7 +29,7 @@ func NewAddRating(client ApiClient, userId string, itemId string, rating float64 return &AddRating{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/ratings/"), + Path: "/ratings/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -74,12 +73,12 @@ func (r *AddRating) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddRating) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_search_synonym.go b/recombee/requests/add_search_synonym.go index b95fb27..bf64f04 100644 --- a/recombee/requests/add_search_synonym.go +++ b/recombee/requests/add_search_synonym.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // AddSearchSynonym Adds a new synonym for the [Search items](https://docs.recombee.com/api#search-items). @@ -36,7 +36,7 @@ func NewAddSearchSynonym(client ApiClient, term string, synonym string) *AddSear return &AddSearchSynonym{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/synonyms/items/"), + Path: "/synonyms/items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 10000 * timepkg.Millisecond, @@ -60,12 +60,12 @@ func (r *AddSearchSynonym) SendWithContext(ctx context.Context) (bindings.Search if err != nil { return bindings.SearchSynonym{}, err } - return *(r.ApiRequest.Target.(*bindings.SearchSynonym)), err + return *(r.Target.(*bindings.SearchSynonym)), err } // Sends the request to the Recombee API func (r *AddSearchSynonym) Send() (bindings.SearchSynonym, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_series.go b/recombee/requests/add_series.go index c78e40f..ab479ac 100644 --- a/recombee/requests/add_series.go +++ b/recombee/requests/add_series.go @@ -49,12 +49,12 @@ func (r *AddSeries) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddSeries) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_user.go b/recombee/requests/add_user.go index 657468e..b671fe5 100644 --- a/recombee/requests/add_user.go +++ b/recombee/requests/add_user.go @@ -42,12 +42,12 @@ func (r *AddUser) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddUser) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/add_user_property.go b/recombee/requests/add_user_property.go index f7c3c58..a0d10c8 100644 --- a/recombee/requests/add_user_property.go +++ b/recombee/requests/add_user_property.go @@ -44,12 +44,12 @@ func (r *AddUserProperty) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *AddUserProperty) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/batch.go b/recombee/requests/batch.go index 36ced33..3a28b5a 100644 --- a/recombee/requests/batch.go +++ b/recombee/requests/batch.go @@ -3,9 +3,10 @@ package requests import ( "context" "encoding/json" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" "time" + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // Batch allows you to submit arbitrary sequence of requests within a single HTTPS request. @@ -103,7 +104,7 @@ func (r Batch) SendWithContext(ctx context.Context) ([]bindings.BatchResponse, e return nil, err } - rawResponses := *smallBatch.ApiRequest.Target.(*[]rawBatchResponse) + rawResponses := *smallBatch.Target.(*[]rawBatchResponse) results := make([]bindings.BatchResponse, len(rawResponses)) for i, rawResponse := range rawResponses { @@ -130,7 +131,7 @@ func (r Batch) SendWithContext(ctx context.Context) ([]bindings.BatchResponse, e // Sends the request to the Recombee API func (r Batch) Send() ([]bindings.BatchResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/composite_recommendation.go b/recombee/requests/composite_recommendation.go index dc13b6d..497d658 100644 --- a/recombee/requests/composite_recommendation.go +++ b/recombee/requests/composite_recommendation.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // CompositeRecommendation Composite Recommendation returns both a *source entity* (e.g., an Item or [Item Segment](https://docs.recombee.com/segmentations.html)) and a list of related recommendations in a single response. @@ -68,7 +68,7 @@ func NewCompositeRecommendation(client ApiClient, scenario string, count int) *C return &CompositeRecommendation{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/recomms/composite/"), + Path: "/recomms/composite/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -143,12 +143,12 @@ func (r *CompositeRecommendation) SendWithContext(ctx context.Context) (bindings if err != nil { return bindings.CompositeRecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.CompositeRecommendationResponse)), err + return *(r.Target.(*bindings.CompositeRecommendationResponse)), err } // Sends the request to the Recombee API func (r *CompositeRecommendation) Send() (bindings.CompositeRecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/create_auto_reql_segmentation.go b/recombee/requests/create_auto_reql_segmentation.go index 3dd1d45..f656ae4 100644 --- a/recombee/requests/create_auto_reql_segmentation.go +++ b/recombee/requests/create_auto_reql_segmentation.go @@ -61,12 +61,12 @@ func (r *CreateAutoReqlSegmentation) SendWithContext(ctx context.Context) (strin if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *CreateAutoReqlSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/create_manual_reql_segmentation.go b/recombee/requests/create_manual_reql_segmentation.go index 3f666e1..5bcfe53 100644 --- a/recombee/requests/create_manual_reql_segmentation.go +++ b/recombee/requests/create_manual_reql_segmentation.go @@ -60,12 +60,12 @@ func (r *CreateManualReqlSegmentation) SendWithContext(ctx context.Context) (str if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *CreateManualReqlSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/create_property_based_segmentation.go b/recombee/requests/create_property_based_segmentation.go index 616dd5b..d93c99c 100644 --- a/recombee/requests/create_property_based_segmentation.go +++ b/recombee/requests/create_property_based_segmentation.go @@ -63,12 +63,12 @@ func (r *CreatePropertyBasedSegmentation) SendWithContext(ctx context.Context) ( if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *CreatePropertyBasedSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_all_search_synonyms.go b/recombee/requests/delete_all_search_synonyms.go index 47bf149..3fc7f2f 100644 --- a/recombee/requests/delete_all_search_synonyms.go +++ b/recombee/requests/delete_all_search_synonyms.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -26,7 +25,7 @@ func NewDeleteAllSearchSynonyms(client ApiClient) *DeleteAllSearchSynonyms { return &DeleteAllSearchSynonyms{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/synonyms/items/"), + Path: "/synonyms/items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 10000 * timepkg.Millisecond, @@ -42,12 +41,12 @@ func (r *DeleteAllSearchSynonyms) SendWithContext(ctx context.Context) (string, if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteAllSearchSynonyms) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_bookmark.go b/recombee/requests/delete_bookmark.go index 324b746..2aff02d 100644 --- a/recombee/requests/delete_bookmark.go +++ b/recombee/requests/delete_bookmark.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeleteBookmark(client ApiClient, userId string, itemId string) *DeleteBo return &DeleteBookmark{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/bookmarks/"), + Path: "/bookmarks/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeleteBookmark) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteBookmark) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_cart_addition.go b/recombee/requests/delete_cart_addition.go index 5ccb9fc..4fab2d9 100644 --- a/recombee/requests/delete_cart_addition.go +++ b/recombee/requests/delete_cart_addition.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeleteCartAddition(client ApiClient, userId string, itemId string) *Dele return &DeleteCartAddition{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/cartadditions/"), + Path: "/cartadditions/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeleteCartAddition) SendWithContext(ctx context.Context) (string, error if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteCartAddition) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_detail_view.go b/recombee/requests/delete_detail_view.go index 962b635..fe4bd38 100644 --- a/recombee/requests/delete_detail_view.go +++ b/recombee/requests/delete_detail_view.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeleteDetailView(client ApiClient, userId string, itemId string) *Delete return &DeleteDetailView{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/detailviews/"), + Path: "/detailviews/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeleteDetailView) SendWithContext(ctx context.Context) (string, error) if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteDetailView) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_item.go b/recombee/requests/delete_item.go index 6ce3449..8035bff 100644 --- a/recombee/requests/delete_item.go +++ b/recombee/requests/delete_item.go @@ -46,12 +46,12 @@ func (r *DeleteItem) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteItem) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_item_property.go b/recombee/requests/delete_item_property.go index 94006e3..a9ea238 100644 --- a/recombee/requests/delete_item_property.go +++ b/recombee/requests/delete_item_property.go @@ -42,12 +42,12 @@ func (r *DeleteItemProperty) SendWithContext(ctx context.Context) (string, error if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteItemProperty) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_manual_reql_segment.go b/recombee/requests/delete_manual_reql_segment.go index 6060943..9c8d639 100644 --- a/recombee/requests/delete_manual_reql_segment.go +++ b/recombee/requests/delete_manual_reql_segment.go @@ -42,12 +42,12 @@ func (r *DeleteManualReqlSegment) SendWithContext(ctx context.Context) (string, if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteManualReqlSegment) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_more_items.go b/recombee/requests/delete_more_items.go index 3be0391..7c927ff 100644 --- a/recombee/requests/delete_more_items.go +++ b/recombee/requests/delete_more_items.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // DeleteMoreItems Deletes all the items that pass the filter. @@ -31,7 +31,7 @@ func NewDeleteMoreItems(client ApiClient, filter string) *DeleteMoreItems { return &DeleteMoreItems{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/more-items/"), + Path: "/more-items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -47,12 +47,12 @@ func (r *DeleteMoreItems) SendWithContext(ctx context.Context) (bindings.DeleteM if err != nil { return bindings.DeleteMoreItemsResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.DeleteMoreItemsResponse)), err + return *(r.Target.(*bindings.DeleteMoreItemsResponse)), err } // Sends the request to the Recombee API func (r *DeleteMoreItems) Send() (bindings.DeleteMoreItemsResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_purchase.go b/recombee/requests/delete_purchase.go index 5d2310b..d58f943 100644 --- a/recombee/requests/delete_purchase.go +++ b/recombee/requests/delete_purchase.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeletePurchase(client ApiClient, userId string, itemId string) *DeletePu return &DeletePurchase{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/purchases/"), + Path: "/purchases/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeletePurchase) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeletePurchase) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_rating.go b/recombee/requests/delete_rating.go index a3fc99d..af0f9e7 100644 --- a/recombee/requests/delete_rating.go +++ b/recombee/requests/delete_rating.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeleteRating(client ApiClient, userId string, itemId string) *DeleteRati return &DeleteRating{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/ratings/"), + Path: "/ratings/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeleteRating) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteRating) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_search_synonym.go b/recombee/requests/delete_search_synonym.go index e2a5bd9..6bf2396 100644 --- a/recombee/requests/delete_search_synonym.go +++ b/recombee/requests/delete_search_synonym.go @@ -42,12 +42,12 @@ func (r *DeleteSearchSynonym) SendWithContext(ctx context.Context) (string, erro if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteSearchSynonym) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_segmentation.go b/recombee/requests/delete_segmentation.go index 422716d..ebfe14c 100644 --- a/recombee/requests/delete_segmentation.go +++ b/recombee/requests/delete_segmentation.go @@ -42,12 +42,12 @@ func (r *DeleteSegmentation) SendWithContext(ctx context.Context) (string, error if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_series.go b/recombee/requests/delete_series.go index aa1e1be..5379ac1 100644 --- a/recombee/requests/delete_series.go +++ b/recombee/requests/delete_series.go @@ -51,12 +51,12 @@ func (r *DeleteSeries) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteSeries) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_user.go b/recombee/requests/delete_user.go index e6ecd04..1d1d6fe 100644 --- a/recombee/requests/delete_user.go +++ b/recombee/requests/delete_user.go @@ -44,12 +44,12 @@ func (r *DeleteUser) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteUser) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_user_property.go b/recombee/requests/delete_user_property.go index 43ca94d..7648c93 100644 --- a/recombee/requests/delete_user_property.go +++ b/recombee/requests/delete_user_property.go @@ -42,12 +42,12 @@ func (r *DeleteUserProperty) SendWithContext(ctx context.Context) (string, error if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteUserProperty) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/delete_view_portion.go b/recombee/requests/delete_view_portion.go index 9ba937b..8b52af3 100644 --- a/recombee/requests/delete_view_portion.go +++ b/recombee/requests/delete_view_portion.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -29,7 +28,7 @@ func NewDeleteViewPortion(client ApiClient, userId string, itemId string) *Delet return &DeleteViewPortion{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/viewportions/"), + Path: "/viewportions/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -52,12 +51,12 @@ func (r *DeleteViewPortion) SendWithContext(ctx context.Context) (string, error) if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *DeleteViewPortion) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/get_item_property_info.go b/recombee/requests/get_item_property_info.go index 6a29e84..74487c8 100644 --- a/recombee/requests/get_item_property_info.go +++ b/recombee/requests/get_item_property_info.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // GetItemPropertyInfo Gets information about specified item property. @@ -43,12 +44,12 @@ func (r *GetItemPropertyInfo) SendWithContext(ctx context.Context) (bindings.Pro if err != nil { return bindings.PropertyInfo{}, err } - return *(r.ApiRequest.Target.(*bindings.PropertyInfo)), err + return *(r.Target.(*bindings.PropertyInfo)), err } // Sends the request to the Recombee API func (r *GetItemPropertyInfo) Send() (bindings.PropertyInfo, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/get_item_values.go b/recombee/requests/get_item_values.go index 37dae08..1ca8c74 100644 --- a/recombee/requests/get_item_values.go +++ b/recombee/requests/get_item_values.go @@ -42,12 +42,12 @@ func (r *GetItemValues) SendWithContext(ctx context.Context) (map[string]interfa if err != nil { return map[string]interface{}{}, err } - return *(r.ApiRequest.Target.(*map[string]interface{})), err + return *(r.Target.(*map[string]interface{})), err } // Sends the request to the Recombee API func (r *GetItemValues) Send() (map[string]interface{}, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/get_segmentation.go b/recombee/requests/get_segmentation.go index 878ce5c..2e6a7ad 100644 --- a/recombee/requests/get_segmentation.go +++ b/recombee/requests/get_segmentation.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // GetSegmentation Get existing Segmentation. @@ -43,12 +44,12 @@ func (r *GetSegmentation) SendWithContext(ctx context.Context) (bindings.Segment if err != nil { return bindings.Segmentation{}, err } - return *(r.ApiRequest.Target.(*bindings.Segmentation)), err + return *(r.Target.(*bindings.Segmentation)), err } // Sends the request to the Recombee API func (r *GetSegmentation) Send() (bindings.Segmentation, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/get_user_property_info.go b/recombee/requests/get_user_property_info.go index e4212b5..01aebbd 100644 --- a/recombee/requests/get_user_property_info.go +++ b/recombee/requests/get_user_property_info.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // GetUserPropertyInfo Gets information about specified user property. @@ -43,12 +44,12 @@ func (r *GetUserPropertyInfo) SendWithContext(ctx context.Context) (bindings.Pro if err != nil { return bindings.PropertyInfo{}, err } - return *(r.ApiRequest.Target.(*bindings.PropertyInfo)), err + return *(r.Target.(*bindings.PropertyInfo)), err } // Sends the request to the Recombee API func (r *GetUserPropertyInfo) Send() (bindings.PropertyInfo, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/get_user_values.go b/recombee/requests/get_user_values.go index 5d1ddd6..525f05d 100644 --- a/recombee/requests/get_user_values.go +++ b/recombee/requests/get_user_values.go @@ -42,12 +42,12 @@ func (r *GetUserValues) SendWithContext(ctx context.Context) (map[string]interfa if err != nil { return map[string]interface{}{}, err } - return *(r.ApiRequest.Target.(*map[string]interface{})), err + return *(r.Target.(*map[string]interface{})), err } // Sends the request to the Recombee API func (r *GetUserValues) Send() (map[string]interface{}, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/insert_to_series.go b/recombee/requests/insert_to_series.go index 2cedecb..c2137e1 100644 --- a/recombee/requests/insert_to_series.go +++ b/recombee/requests/insert_to_series.go @@ -53,12 +53,12 @@ func (r *InsertToSeries) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *InsertToSeries) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_bookmarks.go b/recombee/requests/list_item_bookmarks.go index 2b5cae5..c616579 100644 --- a/recombee/requests/list_item_bookmarks.go +++ b/recombee/requests/list_item_bookmarks.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemBookmarks Lists all the ever-made bookmarks of the given item. @@ -43,12 +44,12 @@ func (r *ListItemBookmarks) SendWithContext(ctx context.Context) ([]bindings.Boo if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Bookmark)), err + return *(r.Target.(*[]bindings.Bookmark)), err } // Sends the request to the Recombee API func (r *ListItemBookmarks) Send() ([]bindings.Bookmark, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_cart_additions.go b/recombee/requests/list_item_cart_additions.go index dc8e613..e541fa7 100644 --- a/recombee/requests/list_item_cart_additions.go +++ b/recombee/requests/list_item_cart_additions.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemCartAdditions Lists all the ever-made cart additions of the given item. @@ -43,12 +44,12 @@ func (r *ListItemCartAdditions) SendWithContext(ctx context.Context) ([]bindings if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.CartAddition)), err + return *(r.Target.(*[]bindings.CartAddition)), err } // Sends the request to the Recombee API func (r *ListItemCartAdditions) Send() ([]bindings.CartAddition, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_detail_views.go b/recombee/requests/list_item_detail_views.go index 29c2471..1902d6f 100644 --- a/recombee/requests/list_item_detail_views.go +++ b/recombee/requests/list_item_detail_views.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemDetailViews Lists all the detail views of the given item ever made by different users. @@ -43,12 +44,12 @@ func (r *ListItemDetailViews) SendWithContext(ctx context.Context) ([]bindings.D if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.DetailView)), err + return *(r.Target.(*[]bindings.DetailView)), err } // Sends the request to the Recombee API func (r *ListItemDetailViews) Send() ([]bindings.DetailView, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_properties.go b/recombee/requests/list_item_properties.go index 06729ba..edcb273 100644 --- a/recombee/requests/list_item_properties.go +++ b/recombee/requests/list_item_properties.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemProperties Gets the list of all the item properties in your database. @@ -27,7 +27,7 @@ func NewListItemProperties(client ApiClient) *ListItemProperties { return &ListItemProperties{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/items/properties/list/"), + Path: "/items/properties/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -43,12 +43,12 @@ func (r *ListItemProperties) SendWithContext(ctx context.Context) ([]bindings.Pr if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.PropertyInfo)), err + return *(r.Target.(*[]bindings.PropertyInfo)), err } // Sends the request to the Recombee API func (r *ListItemProperties) Send() ([]bindings.PropertyInfo, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_purchases.go b/recombee/requests/list_item_purchases.go index 01fbc2c..dfc0075 100644 --- a/recombee/requests/list_item_purchases.go +++ b/recombee/requests/list_item_purchases.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemPurchases Lists all the ever-made purchases of the given item. @@ -43,12 +44,12 @@ func (r *ListItemPurchases) SendWithContext(ctx context.Context) ([]bindings.Pur if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Purchase)), err + return *(r.Target.(*[]bindings.Purchase)), err } // Sends the request to the Recombee API func (r *ListItemPurchases) Send() ([]bindings.Purchase, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_ratings.go b/recombee/requests/list_item_ratings.go index 90165c2..8e5717a 100644 --- a/recombee/requests/list_item_ratings.go +++ b/recombee/requests/list_item_ratings.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemRatings Lists all the ratings of an item ever submitted by different users. @@ -43,12 +44,12 @@ func (r *ListItemRatings) SendWithContext(ctx context.Context) ([]bindings.Ratin if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Rating)), err + return *(r.Target.(*[]bindings.Rating)), err } // Sends the request to the Recombee API func (r *ListItemRatings) Send() ([]bindings.Rating, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_item_view_portions.go b/recombee/requests/list_item_view_portions.go index dc76758..43c427f 100644 --- a/recombee/requests/list_item_view_portions.go +++ b/recombee/requests/list_item_view_portions.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItemViewPortions Lists all the view portions of an item ever submitted by different users. @@ -43,12 +44,12 @@ func (r *ListItemViewPortions) SendWithContext(ctx context.Context) ([]bindings. if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.ViewPortion)), err + return *(r.Target.(*[]bindings.ViewPortion)), err } // Sends the request to the Recombee API func (r *ListItemViewPortions) Send() ([]bindings.ViewPortion, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_items.go b/recombee/requests/list_items.go index a15fed1..48cbef9 100644 --- a/recombee/requests/list_items.go +++ b/recombee/requests/list_items.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListItems Gets a list of IDs of items currently present in the catalog. @@ -27,7 +27,7 @@ func NewListItems(client ApiClient) *ListItems { return &ListItems{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/items/list/"), + Path: "/items/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -116,12 +116,12 @@ func (r *ListItems) SendWithContext(ctx context.Context) ([]bindings.Item, error if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Item)), err + return *(r.Target.(*[]bindings.Item)), err } // Sends the request to the Recombee API func (r *ListItems) Send() ([]bindings.Item, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_scenarios.go b/recombee/requests/list_scenarios.go index 3bb3b9f..0097ca7 100644 --- a/recombee/requests/list_scenarios.go +++ b/recombee/requests/list_scenarios.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListScenarios Get all [Scenarios](https://docs.recombee.com/scenarios) of the given database. @@ -27,7 +27,7 @@ func NewListScenarios(client ApiClient) *ListScenarios { return &ListScenarios{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/scenarios/"), + Path: "/scenarios/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 10000 * timepkg.Millisecond, @@ -43,12 +43,12 @@ func (r *ListScenarios) SendWithContext(ctx context.Context) ([]bindings.Scenari if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Scenario)), err + return *(r.Target.(*[]bindings.Scenario)), err } // Sends the request to the Recombee API func (r *ListScenarios) Send() ([]bindings.Scenario, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_search_synonyms.go b/recombee/requests/list_search_synonyms.go index eb8620b..492cdb5 100644 --- a/recombee/requests/list_search_synonyms.go +++ b/recombee/requests/list_search_synonyms.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListSearchSynonyms Gives the list of synonyms defined in the database. @@ -27,7 +27,7 @@ func NewListSearchSynonyms(client ApiClient) *ListSearchSynonyms { return &ListSearchSynonyms{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/synonyms/items/"), + Path: "/synonyms/items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -57,12 +57,12 @@ func (r *ListSearchSynonyms) SendWithContext(ctx context.Context) (bindings.List if err != nil { return bindings.ListSearchSynonymsResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.ListSearchSynonymsResponse)), err + return *(r.Target.(*bindings.ListSearchSynonymsResponse)), err } // Sends the request to the Recombee API func (r *ListSearchSynonyms) Send() (bindings.ListSearchSynonymsResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_segmentations.go b/recombee/requests/list_segmentations.go index 8909c35..e1ad540 100644 --- a/recombee/requests/list_segmentations.go +++ b/recombee/requests/list_segmentations.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListSegmentations Return all existing items Segmentations. @@ -29,7 +29,7 @@ func NewListSegmentations(client ApiClient, sourceType string) *ListSegmentation return &ListSegmentations{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/segmentations/list/"), + Path: "/segmentations/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 10000 * timepkg.Millisecond, @@ -45,12 +45,12 @@ func (r *ListSegmentations) SendWithContext(ctx context.Context) (bindings.ListS if err != nil { return bindings.ListSegmentationsResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.ListSegmentationsResponse)), err + return *(r.Target.(*bindings.ListSegmentationsResponse)), err } // Sends the request to the Recombee API func (r *ListSegmentations) Send() (bindings.ListSegmentationsResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_series.go b/recombee/requests/list_series.go index 4926625..ced7889 100644 --- a/recombee/requests/list_series.go +++ b/recombee/requests/list_series.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListSeries Gets the list of all the series currently present in the database. @@ -27,7 +27,7 @@ func NewListSeries(client ApiClient) *ListSeries { return &ListSeries{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/series/list/"), + Path: "/series/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -43,12 +43,12 @@ func (r *ListSeries) SendWithContext(ctx context.Context) ([]bindings.Series, er if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Series)), err + return *(r.Target.(*[]bindings.Series)), err } // Sends the request to the Recombee API func (r *ListSeries) Send() ([]bindings.Series, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_series_items.go b/recombee/requests/list_series_items.go index 23061f1..580d49e 100644 --- a/recombee/requests/list_series_items.go +++ b/recombee/requests/list_series_items.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListSeriesItems Lists all the items present in the given series, sorted according to their time index values. @@ -43,12 +44,12 @@ func (r *ListSeriesItems) SendWithContext(ctx context.Context) ([]bindings.Serie if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.SeriesItem)), err + return *(r.Target.(*[]bindings.SeriesItem)), err } // Sends the request to the Recombee API func (r *ListSeriesItems) Send() ([]bindings.SeriesItem, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_bookmarks.go b/recombee/requests/list_user_bookmarks.go index 9025cde..7faca36 100644 --- a/recombee/requests/list_user_bookmarks.go +++ b/recombee/requests/list_user_bookmarks.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserBookmarks Lists all the bookmarks ever made by the given user. @@ -43,12 +44,12 @@ func (r *ListUserBookmarks) SendWithContext(ctx context.Context) ([]bindings.Boo if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Bookmark)), err + return *(r.Target.(*[]bindings.Bookmark)), err } // Sends the request to the Recombee API func (r *ListUserBookmarks) Send() ([]bindings.Bookmark, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_cart_additions.go b/recombee/requests/list_user_cart_additions.go index 8628852..109aa8c 100644 --- a/recombee/requests/list_user_cart_additions.go +++ b/recombee/requests/list_user_cart_additions.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserCartAdditions Lists all the cart additions ever made by the given user. @@ -43,12 +44,12 @@ func (r *ListUserCartAdditions) SendWithContext(ctx context.Context) ([]bindings if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.CartAddition)), err + return *(r.Target.(*[]bindings.CartAddition)), err } // Sends the request to the Recombee API func (r *ListUserCartAdditions) Send() ([]bindings.CartAddition, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_detail_views.go b/recombee/requests/list_user_detail_views.go index 61ed197..d29fc75 100644 --- a/recombee/requests/list_user_detail_views.go +++ b/recombee/requests/list_user_detail_views.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserDetailViews Lists all the detail views of different items ever made by the given user. @@ -43,12 +44,12 @@ func (r *ListUserDetailViews) SendWithContext(ctx context.Context) ([]bindings.D if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.DetailView)), err + return *(r.Target.(*[]bindings.DetailView)), err } // Sends the request to the Recombee API func (r *ListUserDetailViews) Send() ([]bindings.DetailView, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_properties.go b/recombee/requests/list_user_properties.go index 63d1e9a..52edff1 100644 --- a/recombee/requests/list_user_properties.go +++ b/recombee/requests/list_user_properties.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserProperties Gets the list of all the user properties in your database. @@ -27,7 +27,7 @@ func NewListUserProperties(client ApiClient) *ListUserProperties { return &ListUserProperties{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/users/properties/list/"), + Path: "/users/properties/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -43,12 +43,12 @@ func (r *ListUserProperties) SendWithContext(ctx context.Context) ([]bindings.Pr if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.PropertyInfo)), err + return *(r.Target.(*[]bindings.PropertyInfo)), err } // Sends the request to the Recombee API func (r *ListUserProperties) Send() ([]bindings.PropertyInfo, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_purchases.go b/recombee/requests/list_user_purchases.go index 312f1e0..02d04ce 100644 --- a/recombee/requests/list_user_purchases.go +++ b/recombee/requests/list_user_purchases.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserPurchases Lists all the purchases ever made by the given user. @@ -43,12 +44,12 @@ func (r *ListUserPurchases) SendWithContext(ctx context.Context) ([]bindings.Pur if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Purchase)), err + return *(r.Target.(*[]bindings.Purchase)), err } // Sends the request to the Recombee API func (r *ListUserPurchases) Send() ([]bindings.Purchase, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_ratings.go b/recombee/requests/list_user_ratings.go index 32f7c03..1f47e6d 100644 --- a/recombee/requests/list_user_ratings.go +++ b/recombee/requests/list_user_ratings.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserRatings Lists all the ratings ever submitted by the given user. @@ -43,12 +44,12 @@ func (r *ListUserRatings) SendWithContext(ctx context.Context) ([]bindings.Ratin if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.Rating)), err + return *(r.Target.(*[]bindings.Rating)), err } // Sends the request to the Recombee API func (r *ListUserRatings) Send() ([]bindings.Rating, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_user_view_portions.go b/recombee/requests/list_user_view_portions.go index c72459e..c6781ba 100644 --- a/recombee/requests/list_user_view_portions.go +++ b/recombee/requests/list_user_view_portions.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUserViewPortions Lists all the view portions ever submitted by the given user. @@ -43,12 +44,12 @@ func (r *ListUserViewPortions) SendWithContext(ctx context.Context) ([]bindings. if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.ViewPortion)), err + return *(r.Target.(*[]bindings.ViewPortion)), err } // Sends the request to the Recombee API func (r *ListUserViewPortions) Send() ([]bindings.ViewPortion, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/list_users.go b/recombee/requests/list_users.go index d189473..80a0d33 100644 --- a/recombee/requests/list_users.go +++ b/recombee/requests/list_users.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // ListUsers Gets a list of IDs of users currently present in the catalog. @@ -27,7 +27,7 @@ func NewListUsers(client ApiClient) *ListUsers { return &ListUsers{ ApiRequest{ HttpMethod: http.MethodGet, - Path: fmt.Sprintf("/users/list/"), + Path: "/users/list/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -110,12 +110,12 @@ func (r *ListUsers) SendWithContext(ctx context.Context) ([]bindings.User, error if err != nil { return nil, err } - return *(r.ApiRequest.Target.(*[]bindings.User)), err + return *(r.Target.(*[]bindings.User)), err } // Sends the request to the Recombee API func (r *ListUsers) Send() ([]bindings.User, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/merge_users.go b/recombee/requests/merge_users.go index 8aa946a..bb7e18a 100644 --- a/recombee/requests/merge_users.go +++ b/recombee/requests/merge_users.go @@ -55,12 +55,12 @@ func (r *MergeUsers) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *MergeUsers) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_item_segments_to_item.go b/recombee/requests/recommend_item_segments_to_item.go index 4165ef7..778a0a6 100644 --- a/recombee/requests/recommend_item_segments_to_item.go +++ b/recombee/requests/recommend_item_segments_to_item.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemSegmentsToItem Recommends Segments from a [Segmentation](https://docs.recombee.com/segmentations) that are the most relevant to a particular item. @@ -118,12 +119,12 @@ func (r *RecommendItemSegmentsToItem) SendWithContext(ctx context.Context) (bind if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemSegmentsToItem) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_item_segments_to_item_segment.go b/recombee/requests/recommend_item_segments_to_item_segment.go index 7f44af5..b474edc 100644 --- a/recombee/requests/recommend_item_segments_to_item_segment.go +++ b/recombee/requests/recommend_item_segments_to_item_segment.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemSegmentsToItemSegment Recommends Segments from a result [Segmentation](https://docs.recombee.com/segmentations) that are the most relevant to a particular Segment from a context Segmentation. @@ -47,7 +47,7 @@ func NewRecommendItemSegmentsToItemSegment(client ApiClient, contextSegmentId st return &RecommendItemSegmentsToItemSegment{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/recomms/item-segments/item-segments/"), + Path: "/recomms/item-segments/item-segments/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -117,12 +117,12 @@ func (r *RecommendItemSegmentsToItemSegment) SendWithContext(ctx context.Context if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemSegmentsToItemSegment) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_item_segments_to_user.go b/recombee/requests/recommend_item_segments_to_user.go index a696855..e98dd89 100644 --- a/recombee/requests/recommend_item_segments_to_user.go +++ b/recombee/requests/recommend_item_segments_to_user.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemSegmentsToUser Recommends the top Segments from a [Segmentation](https://docs.recombee.com/segmentations) for a particular user, based on the user's past interactions. @@ -117,12 +118,12 @@ func (r *RecommendItemSegmentsToUser) SendWithContext(ctx context.Context) (bind if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemSegmentsToUser) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_items_to_item.go b/recombee/requests/recommend_items_to_item.go index 79bd9fe..34b83c0 100644 --- a/recombee/requests/recommend_items_to_item.go +++ b/recombee/requests/recommend_items_to_item.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemsToItem Recommends a set of items that are somehow related to one given item, *X*. A typical scenario is when the user *A* is viewing *X*. Then you may display items to the user that he might also be interested in. Recommend items to item request gives you Top-N such items, optionally taking the target user *A* into account. @@ -266,12 +267,12 @@ func (r *RecommendItemsToItem) SendWithContext(ctx context.Context) (bindings.Re if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemsToItem) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_items_to_item_segment.go b/recombee/requests/recommend_items_to_item_segment.go index 9199968..6c70d03 100644 --- a/recombee/requests/recommend_items_to_item_segment.go +++ b/recombee/requests/recommend_items_to_item_segment.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemsToItemSegment Recommends Items that are the most relevant to a particular Segment from a context [Segmentation](https://docs.recombee.com/segmentations). @@ -45,7 +45,7 @@ func NewRecommendItemsToItemSegment(client ApiClient, contextSegmentId string, t return &RecommendItemsToItemSegment{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/recomms/item-segments/items/"), + Path: "/recomms/item-segments/items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -254,12 +254,12 @@ func (r *RecommendItemsToItemSegment) SendWithContext(ctx context.Context) (bind if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemsToItemSegment) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_items_to_user.go b/recombee/requests/recommend_items_to_user.go index c8622a3..8b2a7c9 100644 --- a/recombee/requests/recommend_items_to_user.go +++ b/recombee/requests/recommend_items_to_user.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendItemsToUser Based on the user's past interactions (purchases, ratings, etc.) with the items, recommends top-N items that are most likely to be of high value for the given user. @@ -257,12 +258,12 @@ func (r *RecommendItemsToUser) SendWithContext(ctx context.Context) (bindings.Re if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendItemsToUser) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_next_items.go b/recombee/requests/recommend_next_items.go index cfc6448..a747d80 100644 --- a/recombee/requests/recommend_next_items.go +++ b/recombee/requests/recommend_next_items.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendNextItems Returns items that shall be shown to a user as next recommendations when the user e.g. scrolls the page down (*infinite scroll*) or goes to the next page. @@ -69,12 +70,12 @@ func (r *RecommendNextItems) SendWithContext(ctx context.Context) (bindings.Reco if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendNextItems) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_users_to_item.go b/recombee/requests/recommend_users_to_item.go index b217cb1..c371ee9 100644 --- a/recombee/requests/recommend_users_to_item.go +++ b/recombee/requests/recommend_users_to_item.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendUsersToItem Recommends users that are likely to be interested in the given item. @@ -225,12 +226,12 @@ func (r *RecommendUsersToItem) SendWithContext(ctx context.Context) (bindings.Re if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendUsersToItem) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/recommend_users_to_user.go b/recombee/requests/recommend_users_to_user.go index cf18c19..97a20b6 100644 --- a/recombee/requests/recommend_users_to_user.go +++ b/recombee/requests/recommend_users_to_user.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // RecommendUsersToUser Gets users similar to the given user, based on the user's past interactions (purchases, ratings, etc.) and values of properties. @@ -243,12 +244,12 @@ func (r *RecommendUsersToUser) SendWithContext(ctx context.Context) (bindings.Re if err != nil { return bindings.RecommendationResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.RecommendationResponse)), err + return *(r.Target.(*bindings.RecommendationResponse)), err } // Sends the request to the Recombee API func (r *RecommendUsersToUser) Send() (bindings.RecommendationResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/remove_from_series.go b/recombee/requests/remove_from_series.go index 9530f0c..d81726d 100644 --- a/recombee/requests/remove_from_series.go +++ b/recombee/requests/remove_from_series.go @@ -45,12 +45,12 @@ func (r *RemoveFromSeries) SendWithContext(ctx context.Context) (string, error) if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *RemoveFromSeries) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/reset_database.go b/recombee/requests/reset_database.go index accbc93..7d31fc0 100644 --- a/recombee/requests/reset_database.go +++ b/recombee/requests/reset_database.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -26,7 +25,7 @@ func NewResetDatabase(client ApiClient) *ResetDatabase { return &ResetDatabase{ ApiRequest{ HttpMethod: http.MethodDelete, - Path: fmt.Sprintf("/"), + Path: "/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -42,12 +41,12 @@ func (r *ResetDatabase) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *ResetDatabase) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/search_item_segments.go b/recombee/requests/search_item_segments.go index fabec3c..5c64446 100644 --- a/recombee/requests/search_item_segments.go +++ b/recombee/requests/search_item_segments.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // SearchItemSegments Full-text personalized search that returns Segments from a Segmentation. The results are based on the provided `searchQuery` and also on the user's past interactions (purchases, ratings, etc.). @@ -116,12 +117,12 @@ func (r *SearchItemSegments) SendWithContext(ctx context.Context) (bindings.Sear if err != nil { return bindings.SearchResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.SearchResponse)), err + return *(r.Target.(*bindings.SearchResponse)), err } // Sends the request to the Recombee API func (r *SearchItemSegments) Send() (bindings.SearchResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/search_items.go b/recombee/requests/search_items.go index a1ed656..cee459f 100644 --- a/recombee/requests/search_items.go +++ b/recombee/requests/search_items.go @@ -5,9 +5,10 @@ package requests import ( "context" "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // SearchItems Full-text personalized search. The results are based on the provided `searchQuery` and also on the user's past interactions (purchases, ratings, etc.) with the items (items more suitable for the user are preferred in the results). @@ -232,12 +233,12 @@ func (r *SearchItems) SendWithContext(ctx context.Context) (bindings.SearchRespo if err != nil { return bindings.SearchResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.SearchResponse)), err + return *(r.Target.(*bindings.SearchResponse)), err } // Sends the request to the Recombee API func (r *SearchItems) Send() (bindings.SearchResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/set_item_values.go b/recombee/requests/set_item_values.go index bb2d512..61110a2 100644 --- a/recombee/requests/set_item_values.go +++ b/recombee/requests/set_item_values.go @@ -46,12 +46,12 @@ func (r *SetItemValues) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *SetItemValues) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/set_user_values.go b/recombee/requests/set_user_values.go index a36d6da..d1f3d01 100644 --- a/recombee/requests/set_user_values.go +++ b/recombee/requests/set_user_values.go @@ -44,11 +44,11 @@ func (r *SetUserValues) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } func (r *SetUserValues) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/set_view_portion.go b/recombee/requests/set_view_portion.go index b2335b4..55714ef 100644 --- a/recombee/requests/set_view_portion.go +++ b/recombee/requests/set_view_portion.go @@ -4,7 +4,6 @@ package requests import ( "context" - "fmt" "net/http" timepkg "time" // avoid collision with param name ) @@ -32,7 +31,7 @@ func NewSetViewPortion(client ApiClient, userId string, itemId string, portion f return &SetViewPortion{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/viewportions/"), + Path: "/viewportions/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 3000 * timepkg.Millisecond, @@ -97,12 +96,12 @@ func (r *SetViewPortion) SendWithContext(ctx context.Context) (string, error) { if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *SetViewPortion) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/update_auto_reql_segmentation.go b/recombee/requests/update_auto_reql_segmentation.go index d24a184..c521984 100644 --- a/recombee/requests/update_auto_reql_segmentation.go +++ b/recombee/requests/update_auto_reql_segmentation.go @@ -63,12 +63,12 @@ func (r *UpdateAutoReqlSegmentation) SendWithContext(ctx context.Context) (strin if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *UpdateAutoReqlSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/update_manual_reql_segment.go b/recombee/requests/update_manual_reql_segment.go index 08316ea..3e00fba 100644 --- a/recombee/requests/update_manual_reql_segment.go +++ b/recombee/requests/update_manual_reql_segment.go @@ -51,12 +51,12 @@ func (r *UpdateManualReqlSegment) SendWithContext(ctx context.Context) (string, if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *UpdateManualReqlSegment) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/update_manual_reql_segmentation.go b/recombee/requests/update_manual_reql_segmentation.go index d941d6c..da558bd 100644 --- a/recombee/requests/update_manual_reql_segmentation.go +++ b/recombee/requests/update_manual_reql_segmentation.go @@ -56,12 +56,12 @@ func (r *UpdateManualReqlSegmentation) SendWithContext(ctx context.Context) (str if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *UpdateManualReqlSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/update_more_items.go b/recombee/requests/update_more_items.go index a5c6e90..c7fb173 100644 --- a/recombee/requests/update_more_items.go +++ b/recombee/requests/update_more_items.go @@ -4,10 +4,10 @@ package requests import ( "context" - "fmt" - "github.com/recombee/go-api-client/v6/recombee/bindings" "net/http" timepkg "time" // avoid collision with param name + + "github.com/recombee/go-api-client/v6/recombee/bindings" ) // UpdateMoreItems Updates (some) property values of all the items that pass the filter. @@ -46,7 +46,7 @@ func NewUpdateMoreItems(client ApiClient, filter string, changes map[string]inte return &UpdateMoreItems{ ApiRequest{ HttpMethod: http.MethodPost, - Path: fmt.Sprintf("/more-items/"), + Path: "/more-items/", BodyParameters: bodyParameters, QueryParameters: queryParams, DefaultTimeout: 100000 * timepkg.Millisecond, @@ -62,12 +62,12 @@ func (r *UpdateMoreItems) SendWithContext(ctx context.Context) (bindings.UpdateM if err != nil { return bindings.UpdateMoreItemsResponse{}, err } - return *(r.ApiRequest.Target.(*bindings.UpdateMoreItemsResponse)), err + return *(r.Target.(*bindings.UpdateMoreItemsResponse)), err } // Sends the request to the Recombee API func (r *UpdateMoreItems) Send() (bindings.UpdateMoreItemsResponse, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) } diff --git a/recombee/requests/update_property_based_segmentation.go b/recombee/requests/update_property_based_segmentation.go index 003df2b..802c950 100644 --- a/recombee/requests/update_property_based_segmentation.go +++ b/recombee/requests/update_property_based_segmentation.go @@ -63,12 +63,12 @@ func (r *UpdatePropertyBasedSegmentation) SendWithContext(ctx context.Context) ( if err != nil { return "", err } - return *(r.ApiRequest.Target.(*string)), err + return *(r.Target.(*string)), err } // Sends the request to the Recombee API func (r *UpdatePropertyBasedSegmentation) Send() (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), r.ApiRequest.DefaultTimeout) + ctx, cancel := context.WithTimeout(context.Background(), r.DefaultTimeout) defer cancel() return r.SendWithContext(ctx) }