From dba6561ba1f7f8bbd6e38098fddc1b9fd0f64016 Mon Sep 17 00:00:00 2001 From: Miroslav Cvetic Date: Wed, 14 May 2025 10:51:21 +0200 Subject: [PATCH] Reapply "feat: add queryBy param to SimpleSearch" This reverts commit cc2074d954ebee9e29be21a4dae8dd04e6630304. --- pkg/api/api.go | 6 ++---- pkg/api/utils.go | 4 ++++ pkg/interface.go | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index fb0697b..ec44c45 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -277,11 +277,9 @@ func (b *BaseAPI[indexDocument, returnType]) SimpleSearch( filterBy map[string][]string, page, perPage int, sortBy string, + queryBy string, ) ([]returnType, pkgx.Scores, int, error) { - // Call buildSearchParams but also set QueryBy explicitly - parameters := buildSearchParams(q, filterBy, page, perPage, sortBy) - parameters.QueryBy = pointer.String("title") - + parameters := buildSearchParams(q, filterBy, page, perPage, sortBy, queryBy) return b.ExpertSearch(ctx, index, parameters) } diff --git a/pkg/api/utils.go b/pkg/api/utils.go index 898303b..28c7d33 100644 --- a/pkg/api/utils.go +++ b/pkg/api/utils.go @@ -21,6 +21,7 @@ func buildSearchParams( filterBy map[string][]string, page, perPage int, sortBy string, + queryBy string, ) *api.SearchCollectionParams { parameters := &api.SearchCollectionParams{} parameters.Q = pointer.String(q) @@ -32,6 +33,9 @@ func buildSearchParams( if sortBy != "" { parameters.SortBy = pointer.String(sortBy) } + if queryBy != "" { + parameters.QueryBy = pointer.String(queryBy) + } return parameters } diff --git a/pkg/interface.go b/pkg/interface.go index b838883..38b7a72 100644 --- a/pkg/interface.go +++ b/pkg/interface.go @@ -24,6 +24,7 @@ type API[indexDocument any, returnType any] interface { filterBy map[string][]string, page, perPage int, sortBy string, + queryBy string, ) ([]returnType, Scores, int, error) ExpertSearch(ctx context.Context, index IndexID, parameters *api.SearchCollectionParams) ([]returnType, Scores, int, error) Healthz(ctx context.Context) error