From 68cdcc7227a9f60d326d99b77f17689823dacec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman@kendu.si>
Date: Wed, 13 Nov 2019 12:41:49 +0100
Subject: [PATCH] Remove page normalizers

Unneeded.
---
 compose/service/record.go  |  2 --
 pkg/rh/paging.go           | 12 ------------
 pkg/rh/selectors.go        | 17 -----------------
 system/service/reminder.go |  2 --
 4 files changed, 33 deletions(-)

diff --git a/compose/service/record.go b/compose/service/record.go
index 05b67f5e7..4085ad960 100644
--- a/compose/service/record.go
+++ b/compose/service/record.go
@@ -207,8 +207,6 @@ func (svc record) Report(namespaceID, moduleID uint64, metrics, dimensions, filt
 }
 
 func (svc record) Find(filter types.RecordFilter) (set types.RecordSet, f types.RecordFilter, err error) {
-	filter.PageFilter.NormalizePerPageWithDefaults()
-
 	var m *types.Module
 	if m, err = svc.loadModule(filter.NamespaceID, filter.ModuleID); err != nil {
 		return
diff --git a/pkg/rh/paging.go b/pkg/rh/paging.go
index ae6703960..2a4d102c1 100644
--- a/pkg/rh/paging.go
+++ b/pkg/rh/paging.go
@@ -24,15 +24,3 @@ func Paging(page, perPage uint) PageFilter {
 		PerPage: perPage,
 	}
 }
-
-func (pf *PageFilter) NormalizePerPage(min, max, def uint) {
-	pf.PerPage = NormalizePerPage(pf.PerPage, min, max, def)
-}
-
-func (pf *PageFilter) NormalizePerPageWithDefaults() {
-	pf.PerPage = NormalizePerPage(pf.PerPage, PER_PAGE_MIN, PER_PAGE_MAX, PER_PAGE_DEFAULT)
-}
-
-func (pf *PageFilter) NormalizePerPageNoMax() {
-	pf.PerPage = NormalizePerPage(pf.PerPage, PER_PAGE_MIN, 0, PER_PAGE_DEFAULT)
-}
diff --git a/pkg/rh/selectors.go b/pkg/rh/selectors.go
index 3393d40e3..30c459dca 100644
--- a/pkg/rh/selectors.go
+++ b/pkg/rh/selectors.go
@@ -71,23 +71,6 @@ func FetchAll(db *factory.DB, q squirrel.Sqlizer, set interface{}) error {
 	}
 }
 
-// NormalizePerPage normalize page number
-func NormalizePerPage(val, min, max, def uint) uint {
-	if val == 0 {
-		return def
-	}
-
-	if max > 0 && val > max {
-		return max
-	}
-
-	if min > 0 && val < min {
-		return min
-	}
-
-	return val
-}
-
 // IsFound helps with one-row results
 func IsFound(err error, valid bool, nerr error) error {
 	if err != nil {
diff --git a/system/service/reminder.go b/system/service/reminder.go
index 88a8637d8..ae1bd515b 100644
--- a/system/service/reminder.go
+++ b/system/service/reminder.go
@@ -49,8 +49,6 @@ func Reminder(ctx context.Context) ReminderService {
 }
 
 func (svc reminder) Find(ctx context.Context, f types.ReminderFilter) (types.ReminderSet, types.ReminderFilter, error) {
-	f.PageFilter.NormalizePerPageNoMax()
-
 	rr, f, err := svc.reminder.Find(f)
 	if err != nil {
 		return nil, f, err