From 80c8f341de024aa0f53b9adab447af1bf726a2ec Mon Sep 17 00:00:00 2001 From: Danis Kirasirov <dbgbbu@gmail.com> Date: Tue, 13 Feb 2024 18:41:49 +0300 Subject: [PATCH] refactoring --- pkg/items/pagination.go | 4 ++-- pkg/options/options.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/items/pagination.go b/pkg/items/pagination.go index de9354a3..6db5c324 100644 --- a/pkg/items/pagination.go +++ b/pkg/items/pagination.go @@ -37,7 +37,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) { Regular: b.FindPublishedOptions.Regular, Hidden: b.FindPublishedOptions.Hidden, Templates: b.FindPublishedOptions.Templates, - FindOptions: *options.GetFindOptions(b.processed, b.limit, b.sort...), + FindOptions: *options.New(b.processed, b.limit, b.sort...), }, ) } else { @@ -52,7 +52,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) { Regular: b.FindOptions.Regular, Hidden: b.FindOptions.Hidden, Templates: b.FindOptions.Templates, - FindOptions: *options.GetFindOptions(b.processed, b.limit, b.sort...), + FindOptions: *options.New(b.processed, b.limit, b.sort...), }, ) } diff --git a/pkg/options/options.go b/pkg/options/options.go index 6de164ac..cb0bd504 100644 --- a/pkg/options/options.go +++ b/pkg/options/options.go @@ -39,14 +39,14 @@ type FindOptions struct { FieldOptions } -// Deprecated использовать GetFindOptions +// Deprecated использовать New // NewFindOptions создает новые результаты поиска func NewFindOptions(pageNum, pageSize int, sort ...string) *FindOptions { - return GetFindOptions(pageNum*pageSize, pageSize, sort...) + return New(pageNum*pageSize, pageSize, sort...) } -// GetFindOptions создает новые параметры поиска -func GetFindOptions(offset, limit int, sort ...string) *FindOptions { +// New создает новые параметры поиска +func New(offset, limit int, sort ...string) *FindOptions { return &FindOptions{ PaginationOptions: PaginationOptions{ Offset: offset, -- GitLab