From 81d7873c54b80340413d057fd512db51e55e1de6 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Mon, 22 Jan 2024 16:43:20 +0300
Subject: [PATCH] =?UTF-8?q?-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?=
=?UTF-8?q?=D0=B2=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=20=D0=B2=20?=
=?UTF-8?q?MergePaginationOptions=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
=?UTF-8?q?=D0=B0=20=D0=B2=20BatchProcessor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/items/pagination.go | 10 +++++-----
pkg/options/options.go | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/items/pagination.go b/pkg/items/pagination.go
index 6fe197d7..754eb22b 100644
--- a/pkg/items/pagination.go
+++ b/pkg/items/pagination.go
@@ -16,9 +16,9 @@ type BatchProcessor struct {
FindPublishedOptions *FindPublishedOptions
Filter *Filter
- pageSize, pageNum int
- sort []string
- processed int
+ pageSize, pageNum, offset, limit int
+ sort []string
+ processed int
}
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,
Hidden: b.FindPublishedOptions.Hidden,
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 {
@@ -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.NewFindOptions(b.pageNum, b.pageSize, b.sort...),
+ FindOptions: *options.NewFindOptions(b.pageNum, b.pageSize, b.offset, b.limit, b.sort...),
},
)
}
diff --git a/pkg/options/options.go b/pkg/options/options.go
index b55c0ff3..8b172de8 100644
--- a/pkg/options/options.go
+++ b/pkg/options/options.go
@@ -102,7 +102,7 @@ func MergeSortOptions(options ...SortOptions) SortOptions {
func MergePaginationOptions(options ...PaginationOptions) PaginationOptions {
fo := PaginationOptions{}
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
}
fo.PageNum = opt.PageNum
--
GitLab