From 5fba4ed6ef587e1c5d3003d46e6cca66ff99b7e2 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Aug 2024 18:41:20 +0200
Subject: [PATCH] chore(web): use config directly

(cherry picked from commit bcfd72c64545241b53fc8a69197cfc6a3f316d92)
---
 pkg/routes/routes.go        | 2 --
 pkg/web/handler/config.go   | 6 ------
 pkg/web/handler/read_all.go | 7 ++++---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkg/routes/routes.go b/pkg/routes/routes.go
index 37bc20e43..1d3f0cbfe 100644
--- a/pkg/routes/routes.go
+++ b/pkg/routes/routes.go
@@ -58,7 +58,6 @@ import (
 	"time"
 
 	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
@@ -124,7 +123,6 @@ func NewEcho() *echo.Echo {
 		AuthObject: auth.GetAuthFromClaims,
 	})
 	handler.SetLoggingProvider(log.GetLogger())
-	handler.SetMaxItemsPerPage(config.ServiceMaxItemsPerPage.GetInt())
 
 	return e
 }
diff --git a/pkg/web/handler/config.go b/pkg/web/handler/config.go
index 549d5129a..197d17aa8 100644
--- a/pkg/web/handler/config.go
+++ b/pkg/web/handler/config.go
@@ -25,7 +25,6 @@ import (
 type Config struct {
 	AuthProvider    *web.Auths
 	LoggingProvider *logging.Logger
-	MaxItemsPerPage int
 }
 
 var config *Config
@@ -43,8 +42,3 @@ func SetAuthProvider(provider *web.Auths) {
 func SetLoggingProvider(logger *logging.Logger) {
 	config.LoggingProvider = logger
 }
-
-// SetMaxItemsPerPage sets the max number of items per page in the config
-func SetMaxItemsPerPage(maxItemsPerPage int) {
-	config.MaxItemsPerPage = maxItemsPerPage
-}
diff --git a/pkg/web/handler/read_all.go b/pkg/web/handler/read_all.go
index 0d57da912..ac0e1bd15 100644
--- a/pkg/web/handler/read_all.go
+++ b/pkg/web/handler/read_all.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"strconv"
 
+	vconfig "code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 
 	"github.com/labstack/echo/v4"
@@ -76,13 +77,13 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
 	}
 	// Set default page count
 	if perPageNumber == 0 {
-		perPageNumber = config.MaxItemsPerPage
+		perPageNumber = vconfig.ServiceMaxItemsPerPage.GetInt()
 	}
 	if perPageNumber < 1 {
 		return echo.NewHTTPError(http.StatusBadRequest, "Per page amount cannot be negative.")
 	}
-	if perPageNumber > config.MaxItemsPerPage {
-		perPageNumber = config.MaxItemsPerPage
+	if perPageNumber > vconfig.ServiceMaxItemsPerPage.GetInt() {
+		perPageNumber = vconfig.ServiceMaxItemsPerPage.GetInt()
 	}
 
 	// Create the db session