Skip to content
Snippets Groups Projects
Commit 81d7873c authored by ko_oler's avatar ko_oler
Browse files

- правка в условие в MergePaginationOptions

- правка в BatchProcessor
parent f4d2c83d
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ type BatchProcessor struct { ...@@ -16,7 +16,7 @@ type BatchProcessor struct {
FindPublishedOptions *FindPublishedOptions FindPublishedOptions *FindPublishedOptions
Filter *Filter Filter *Filter
pageSize, pageNum int pageSize, pageNum, offset, limit int
sort []string sort []string
processed int processed int
} }
...@@ -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.NewFindOptions(b.pageNum, b.pageSize, b.sort...), FindOptions: *options.NewFindOptions(b.pageNum, b.pageSize, b.offset, 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.NewFindOptions(b.pageNum, b.pageSize, b.sort...), FindOptions: *options.NewFindOptions(b.pageNum, b.pageSize, b.offset, b.limit, b.sort...),
}, },
) )
} }
......
...@@ -102,7 +102,7 @@ func MergeSortOptions(options ...SortOptions) SortOptions { ...@@ -102,7 +102,7 @@ func MergeSortOptions(options ...SortOptions) SortOptions {
func MergePaginationOptions(options ...PaginationOptions) PaginationOptions { func MergePaginationOptions(options ...PaginationOptions) PaginationOptions {
fo := PaginationOptions{} fo := PaginationOptions{}
for _, opt := range options { for _, opt := range options {
if opt.PageSize == 0 && opt.PageNum == 0 || opt.Offset == 0 && opt.Limit == 0 { if opt.PageSize == 0 && opt.PageNum == 0 && opt.Offset == 0 && opt.Limit == 0 {
continue continue
} }
fo.PageNum = opt.PageNum fo.PageNum = opt.PageNum
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment