diff --git a/log/client.go b/log/client.go index 97ae04aa8c39c23520a48b0850b7921c0f6f230c..65413f4f5ea9fd6d99b8d87bea668b6c585ba391 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