From 7f438f05ced7a7c9b067530f501a3026905ae924 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Mon, 12 Feb 2024 16:33:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=20client.go?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log/client.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/log/client.go b/log/client.go index 97ae04aa..65413f4f 100644 --- a/log/client.go +++ b/log/client.go @@ -5,7 +5,6 @@ import ( errorsgrpc "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" "git.perx.ru/perxis/perxis-go/pkg/options" - "git.perx.ru/perxis/perxis-go/proto/common" pb "git.perx.ru/perxis/perxis-go/proto/log" "google.golang.org/grpc" ) @@ -37,20 +36,15 @@ func (c *Client) Log(ctx context.Context, entries []*Entry) error { return nil } -func (c *Client) Find(ctx context.Context, filter *Filter, options *options.FindOptions) (*FindResult, error) { +func (c *Client) Find(ctx context.Context, filter *Filter, opts *options.FindOptions) (*FindResult, error) { request := new(pb.FindRequest) + if filter != nil { request.Filter = &pb.Filter{Q: filter.Q} } - if options != nil { - request.Options = &common.FindOptions{ - Sort: options.Sort, - Offset: int32(options.Offset), - Limit: int32(options.Limit), - PageSize: int32(options.PageSize), - PageNum: int32(options.PageNum), - } - } + + request.Options = options.FindOptionsToPB(opts) + response, err := c.client.Find(ctx, request) if err != nil { return nil, err -- GitLab