From 39ef3fa9e53a4566d4508234a38f359497abd060 Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Sun, 26 Nov 2023 00:24:27 +0100
Subject: [PATCH] where clause

---
 rspagination/rspagination.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rspagination/rspagination.go b/rspagination/rspagination.go
index 496408d..b00b9c8 100644
--- a/rspagination/rspagination.go
+++ b/rspagination/rspagination.go
@@ -36,6 +36,13 @@ type PageQuery struct {
 }
 
 func DbPageQuery(database *gorm.DB, query PageQuery, paginationLimit int, result any, orderBy string, whereQuery interface{}, args ...interface{}) *gorm.DB {
+	if whereQuery == nil {
+		return database.Limit(paginationLimit).
+			Offset(GetPageOffset(query.Page, paginationLimit)).
+			Order(orderBy).
+			Find(result)
+	}
+
 	return database.Limit(paginationLimit).
 		Offset(GetPageOffset(query.Page, paginationLimit)).
 		Where(whereQuery, args).
@@ -43,13 +50,6 @@ func DbPageQuery(database *gorm.DB, query PageQuery, paginationLimit int, result
 		Find(result)
 }
 
-func DbPageQueryWithoutWhere(database *gorm.DB, query PageQuery, paginationLimit int, result any, orderBy string) *gorm.DB {
-	return database.Limit(paginationLimit).
-		Offset(GetPageOffset(query.Page, paginationLimit)).
-		Order(orderBy).
-		Find(result)
-}
-
 // GetPage returns start and end for pagination
 // can be used like this: robots[start:end]
 func GetPage(lenList int, page int, limit int) (start int, end int) {