♻️ Refactor(paginate.go): update no offeset query id

booscaaa · Nov 10, 2023 · 23473a9 · 23473a9
1 parent 43a51ae
commit 23473a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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)
 	}