Skip to content
Snippets Groups Projects
Commit 80c8f341 authored by Danis Kirasirov's avatar Danis Kirasirov
Browse files

refactoring

parent 3b940253
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) { ...@@ -37,7 +37,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) {
Regular: b.FindPublishedOptions.Regular, Regular: b.FindPublishedOptions.Regular,
Hidden: b.FindPublishedOptions.Hidden, Hidden: b.FindPublishedOptions.Hidden,
Templates: b.FindPublishedOptions.Templates, Templates: b.FindPublishedOptions.Templates,
FindOptions: *options.GetFindOptions(b.processed, b.limit, b.sort...), FindOptions: *options.New(b.processed, b.limit, b.sort...),
}, },
) )
} else { } else {
...@@ -52,7 +52,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) { ...@@ -52,7 +52,7 @@ func (b *BatchProcessor) getBatch(ctx context.Context) ([]*Item, bool, error) {
Regular: b.FindOptions.Regular, Regular: b.FindOptions.Regular,
Hidden: b.FindOptions.Hidden, Hidden: b.FindOptions.Hidden,
Templates: b.FindOptions.Templates, Templates: b.FindOptions.Templates,
FindOptions: *options.GetFindOptions(b.processed, b.limit, b.sort...), FindOptions: *options.New(b.processed, b.limit, b.sort...),
}, },
) )
} }
......
...@@ -39,14 +39,14 @@ type FindOptions struct { ...@@ -39,14 +39,14 @@ type FindOptions struct {
FieldOptions FieldOptions
} }
// Deprecated использовать GetFindOptions // Deprecated использовать New
// NewFindOptions создает новые результаты поиска // NewFindOptions создает новые результаты поиска
func NewFindOptions(pageNum, pageSize int, sort ...string) *FindOptions { func NewFindOptions(pageNum, pageSize int, sort ...string) *FindOptions {
return GetFindOptions(pageNum*pageSize, pageSize, sort...) return New(pageNum*pageSize, pageSize, sort...)
} }
// GetFindOptions создает новые параметры поиска // New создает новые параметры поиска
func GetFindOptions(offset, limit int, sort ...string) *FindOptions { func New(offset, limit int, sort ...string) *FindOptions {
return &FindOptions{ return &FindOptions{
PaginationOptions: PaginationOptions{ PaginationOptions: PaginationOptions{
Offset: offset, Offset: offset,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment