refactor: use Fiber's new query parameter helpers

bfabio · Jun 16, 2023 · 5d67ae6 · 5d67ae6
1 parent 9ae30c5
commit 5d67ae6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/internal/handlers/general/pagination.go b/internal/handlers/general/pagination.go
@@ -3,7 +3,6 @@ package general
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/pilagod/gorm-cursor-paginator/v2/paginator"
@@ -48,13 +47,10 @@ func NewPaginatorWithConfig(ctx *fiber.Ctx, config *paginator.Config) *paginator
 		paginator.SetBeforeCursor(before)
 	}
 
-	if size := ctx.Query("page[size]"); size != "" {
-		//nolint:godox // need to implement this in the future
-		// TODO: make the API return the error if limit is not an integer
-		if limit, err := strconv.Atoi(size); err == nil {
-			paginator.SetLimit(limit)
-		}
-	}
+	//nolint:godox // need to implement this in the future
+	// TODO: make the API return the error if limit is not an integer
+	size := ctx.QueryInt("page[size]", DefaultLimitCount)
+	paginator.SetLimit(size)
 
 	return paginator
 }

diff --git a/internal/handlers/publishers.go b/internal/handlers/publishers.go
@@ -44,7 +44,7 @@ func (p *Publisher) GetPublishers(ctx *fiber.Ctx) error {
 
 	stmt := p.db.Preload("CodeHosting")
 
-	if all := ctx.Query("all", ""); all == "" {
+	if all := ctx.QueryBool("all", false); !all {
 		stmt = stmt.Scopes(models.Active)
 	}
 

diff --git a/internal/handlers/software.go b/internal/handlers/software.go
@@ -63,7 +63,7 @@ func (p *Software) GetAllSoftware(ctx *fiber.Ctx) error { //nolint:cyclop // mos
 
 		stmt.Where("id = ?", softwareURL.SoftwareID)
 	} else {
-		if all := ctx.Query("all", ""); all == "" {
+		if all := ctx.QueryBool("all", false); !all {
 			stmt = stmt.Scopes(models.Active)
 		}
 	}