Skip to content

Commit

Permalink
Swap multi search argument names (#148)
Browse files Browse the repository at this point in the history
The first argument to the Perform* functions contains the common
parameters, with the second argument containing individual search
parameters.
  • Loading branch information
jackwilsdon committed Sep 19, 2023
1 parent 24486a6 commit 3cc50f7
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions typesense/multi_search.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (
)

type MultiSearchInterface interface {
Perform(searchParams *api.MultiSearchParams, commonSearchParams api.MultiSearchSearchesParameter) (*api.MultiSearchResult, error)
PerformWithContentType(searchParams *api.MultiSearchParams, commonSearchParams api.MultiSearchSearchesParameter, contentType string) (*api.MultiSearchResponse, error)
Perform(commonSearchParams *api.MultiSearchParams, searchParams api.MultiSearchSearchesParameter) (*api.MultiSearchResult, error)
PerformWithContentType(commonSearchParams *api.MultiSearchParams, searchParams api.MultiSearchSearchesParameter, contentType string) (*api.MultiSearchResponse, error)
}

type multiSearch struct {
apiClient APIClientInterface
}

func (m *multiSearch) Perform(searchParams *api.MultiSearchParams, commonSearchParams api.MultiSearchSearchesParameter) (*api.MultiSearchResult, error) {
response, err := m.apiClient.MultiSearchWithResponse(context.Background(), searchParams, api.MultiSearchJSONRequestBody(commonSearchParams))
func (m *multiSearch) Perform(commonSearchParams *api.MultiSearchParams, searchParams api.MultiSearchSearchesParameter) (*api.MultiSearchResult, error) {
response, err := m.apiClient.MultiSearchWithResponse(context.Background(), commonSearchParams, api.MultiSearchJSONRequestBody(searchParams))
if err != nil {
return nil, err
}
Expand All @@ -29,15 +29,15 @@ func (m *multiSearch) Perform(searchParams *api.MultiSearchParams, commonSearchP
return response.JSON200, nil
}

func (m *multiSearch) PerformWithContentType(searchParams *api.MultiSearchParams, commonSearchParams api.MultiSearchSearchesParameter, contentType string) (*api.MultiSearchResponse, error) {
body := api.MultiSearchJSONRequestBody(commonSearchParams)
func (m *multiSearch) PerformWithContentType(commonSearchParams *api.MultiSearchParams, searchParams api.MultiSearchSearchesParameter, contentType string) (*api.MultiSearchResponse, error) {
body := api.MultiSearchJSONRequestBody(searchParams)
var requestReader io.Reader
buf, err := json.Marshal(body)
if err != nil {
return nil, err
}
requestReader = bytes.NewReader(buf)
response, err := m.apiClient.MultiSearchWithBodyWithResponse(context.Background(), searchParams, contentType, requestReader)
response, err := m.apiClient.MultiSearchWithBodyWithResponse(context.Background(), commonSearchParams, contentType, requestReader)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 3cc50f7

Please sign in to comment.