From bdfc2740874459992d2f3e81443d585ba8fea43f Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sat, 4 May 2019 18:19:07 +0200 Subject: [PATCH] Remove paging constraints --- compose/internal/repository/attachment.go | 2 +- compose/internal/repository/chart.go | 1 - compose/internal/repository/module.go | 1 - compose/internal/repository/namespace.go | 1 - compose/internal/repository/page.go | 1 - compose/internal/repository/repository.go | 14 +++++++++----- compose/internal/repository/trigger.go | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/compose/internal/repository/attachment.go b/compose/internal/repository/attachment.go index c12182829..49da1f1d4 100644 --- a/compose/internal/repository/attachment.go +++ b/compose/internal/repository/attachment.go @@ -80,7 +80,7 @@ func (r attachment) FindByID(namespaceID, attachmentID uint64) (*types.Attachmen func (r attachment) Find(filter types.AttachmentFilter) (set types.AttachmentSet, f types.AttachmentFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) + // f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query(). Where(squirrel.Eq{"a.kind": f.Kind}) diff --git a/compose/internal/repository/chart.go b/compose/internal/repository/chart.go index e068426a0..49112ed3d 100644 --- a/compose/internal/repository/chart.go +++ b/compose/internal/repository/chart.go @@ -76,7 +76,6 @@ func (r chart) FindByID(namespaceID, chartID uint64) (*types.Chart, error) { func (r chart) Find(filter types.ChartFilter) (set types.ChartSet, f types.ChartFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query() diff --git a/compose/internal/repository/module.go b/compose/internal/repository/module.go index 117d4b2f1..1a7aa02b2 100644 --- a/compose/internal/repository/module.go +++ b/compose/internal/repository/module.go @@ -80,7 +80,6 @@ func (r module) FindByID(namespaceID, moduleID uint64) (*types.Module, error) { func (r module) Find(filter types.ModuleFilter) (set types.ModuleSet, f types.ModuleFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query() diff --git a/compose/internal/repository/namespace.go b/compose/internal/repository/namespace.go index a8cfae8e9..6629a80bb 100644 --- a/compose/internal/repository/namespace.go +++ b/compose/internal/repository/namespace.go @@ -79,7 +79,6 @@ func (r *namespace) FindByID(namespaceID uint64) (*types.Namespace, error) { func (r *namespace) Find(filter types.NamespaceFilter) (set types.NamespaceSet, f types.NamespaceFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query() if f.Query != "" { diff --git a/compose/internal/repository/page.go b/compose/internal/repository/page.go index 02d8b0bde..e117bcc74 100644 --- a/compose/internal/repository/page.go +++ b/compose/internal/repository/page.go @@ -97,7 +97,6 @@ func (r page) FindByModuleID(namespaceID, moduleID uint64) (*types.Page, error) func (r page) Find(filter types.PageFilter) (set types.PageSet, f types.PageFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query() diff --git a/compose/internal/repository/repository.go b/compose/internal/repository/repository.go index 547d6d687..6e82c6a0f 100644 --- a/compose/internal/repository/repository.go +++ b/compose/internal/repository/repository.go @@ -86,9 +86,13 @@ func (r repository) count(q squirrel.SelectBuilder) (uint, error) { // Fetches paged rows func (r repository) fetchPaged(set interface{}, q squirrel.SelectBuilder, page, perPage uint) error { - q = q. - Limit(uint64(perPage)). - Offset(uint64(page * perPage)) + if perPage > 0 { + q = q.Limit(uint64(perPage)) + } + + if page > 0 { + q = q.Offset(uint64(page * perPage)) + } if sqlSelect, argsSelect, err := q.ToSql(); err != nil { return err @@ -102,11 +106,11 @@ func normalizePerPage(val, min, max, def uint) uint { return def } - if val > max { + if max > 0 && val > max { return max } - if val < min { + if min > 0 && val < min { return min } diff --git a/compose/internal/repository/trigger.go b/compose/internal/repository/trigger.go index 045094d5d..cb04abbce 100644 --- a/compose/internal/repository/trigger.go +++ b/compose/internal/repository/trigger.go @@ -77,7 +77,6 @@ func (r trigger) FindByID(namespaceID, triggerID uint64) (*types.Trigger, error) func (r trigger) Find(filter types.TriggerFilter) (set types.TriggerSet, f types.TriggerFilter, err error) { f = filter - f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50) query := r.query()