From 5e713d05c7d1b21867633c35b0fdbd883244cf31 Mon Sep 17 00:00:00 2001 From: Damillora Date: Sat, 22 Feb 2025 12:59:12 +0000 Subject: [PATCH] feat: make perPage param actually matter --- pkg/app/post_routes.go | 4 ++-- pkg/services/post.go | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/app/post_routes.go b/pkg/app/post_routes.go index 215193f..8d6d4d6 100644 --- a/pkg/app/post_routes.go +++ b/pkg/app/post_routes.go @@ -47,10 +47,10 @@ func postGet(c *gin.Context) { var postPages int if tag != "" { - posts = services.GetPostTags(page, tags) + posts = services.GetPostTags(page, perPage, tags) postPages = services.CountPostPagesTag(tags) } else { - posts = services.GetPostAll(page) + posts = services.GetPostAll(page, perPage) postPages = services.CountPostPages() } diff --git a/pkg/services/post.go b/pkg/services/post.go index ec9ea92..73e1a4b 100644 --- a/pkg/services/post.go +++ b/pkg/services/post.go @@ -9,15 +9,13 @@ import ( "github.com/google/uuid" ) -const perPage = 20 - -func GetPostAll(page int) []database.Post { +func GetPostAll(page int, perPage int) []database.Post { var posts []database.Post - database.DB.Joins("Blob").Preload("Tags").Preload("Tags.TagType").Order("created_at desc").Offset((page - 1) * perPage).Limit(20).Find(&posts) + database.DB.Joins("Blob").Preload("Tags").Preload("Tags.TagType").Order("created_at desc").Offset((page - 1) * perPage).Limit(perPage).Find(&posts) return posts } -func GetPostTags(page int, tagSyntax []string) []database.Post { +func GetPostTags(page int, perPage int, tagSyntax []string) []database.Post { positiveTagSyntax := []string{} negativeTagSyntax := []string{} @@ -87,7 +85,7 @@ func GetPostTags(page int, tagSyntax []string) []database.Post { } query.Order("created_at desc"). Offset((page - 1) * perPage). - Limit(20). + Limit(perPage). Find(&posts) return posts }