From 4f87ef246cc15d2b4a3effb3dff5cf3ece9a44b3 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:19:33 +0100
Subject: [bugfix] paging rel links (#2883)

* fix paging so it uses correct cursor query parameter name

* improved code comment

* whoops, flip the cursoring :facepalm:

* fix the broken test
---
 internal/paging/page.go | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'internal/paging/page.go')

diff --git a/internal/paging/page.go b/internal/paging/page.go
index a1cf76c74..8e8261396 100644
--- a/internal/paging/page.go
+++ b/internal/paging/page.go
@@ -289,14 +289,27 @@ func (p *Page) ToLinkURL(proto, host, path string, queryParams url.Values) *url.
 		queryParams = cloneQuery(queryParams)
 	}
 
-	if p.Min.Value != "" {
-		// A page-minimum query parameter is available.
-		queryParams.Set(p.Min.Name, p.Min.Value)
+	var cursor string
+
+	// Depending on page ordering, the
+	// page will be cursored by either
+	// the min or max query parameter.
+	if p.order().Ascending() {
+		cursor = p.Min.Name
+	} else {
+		cursor = p.Max.Name
 	}
 
-	if p.Max.Value != "" {
-		// A page-maximum query parameter is available.
-		queryParams.Set(p.Max.Name, p.Max.Value)
+	if cursor != "" {
+		if p.Min.Value != "" {
+			// Set page-minimum cursor value.
+			queryParams.Set(cursor, p.Min.Value)
+		}
+
+		if p.Max.Value != "" {
+			// Set page-maximum cursor value.
+			queryParams.Set(cursor, p.Max.Value)
+		}
 	}
 
 	if p.Limit > 0 {
-- 
cgit v1.2.3