From 23473a9ffe643b1053e748304c4bbd888ee07b96 Mon Sep 17 00:00:00 2001 From: bosca Date: Fri, 10 Nov 2023 10:34:58 -0300 Subject: [PATCH] :recycle: Refactor(paginate.go): update no offeset query id --- v2/paginate/paginate.go | 6 +++--- v2/paginate/paginate_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v2/paginate/paginate.go b/v2/paginate/paginate.go index 0f39413..a15b371 100644 --- a/v2/paginate/paginate.go +++ b/v2/paginate/paginate.go @@ -270,7 +270,7 @@ func GenerateSQL(params *paginQueryParams) (string, []interface{}) { if columnName != "" { argNum := nextArg() argNumNext := nextArg() - sortClauses = append(sortClauses, fmt.Sprintf("((%s = $%d) OR (%s %s $%d AND id %s $%d))", + sortClauses = append(sortClauses, fmt.Sprintf("(((%s = $%d) OR (%s %s $%d)) AND id %s $%d)", columnName, argNum, columnName, getComparisonOperator(params.SortDirections[i]), argNum, getComparisonOperator(params.SortDirections[i]), argNumNext)) args[len(args)-2] = params.mapArgs[column] args[len(args)-1] = params.mapArgs["id"] @@ -352,9 +352,9 @@ func GenerateSQL(params *paginQueryParams) (string, []interface{}) { func getComparisonOperator(direction string) string { if direction == "true" { - return ">" + return "<" } - return "<" + return ">" } func GenerateCountQuery(params *paginQueryParams) (string, []interface{}) { diff --git a/v2/paginate/paginate_test.go b/v2/paginate/paginate_test.go index 65fc259..ca9eb4e 100644 --- a/v2/paginate/paginate_test.go +++ b/v2/paginate/paginate_test.go @@ -159,14 +159,14 @@ func TestGenerateCountQuery(t *testing.T) { func TestGetComparisonOperator(t *testing.T) { // Test case 1: Sorting direction is true (descending) operator := getComparisonOperator("true") - expectedOperator := ">" + expectedOperator := "<" if operator != expectedOperator { t.Errorf("Expected operator: %s, Got: %s", expectedOperator, operator) } // Test case 2: Sorting direction is false (ascending) operator = getComparisonOperator("false") - expectedOperator = "<" + expectedOperator = ">" if operator != expectedOperator { t.Errorf("Expected operator: %s, Got: %s", expectedOperator, operator) }