fix: use default_limit instead of max_page_size when first/last/limit not provided (#408)

Author: nallwhy

lib/graphql/resolver.ex

@@ -1219,14 +1219,17 @@ defmodule AshGraphql.Graphql.Resolver do
     end
   end
 
-  defp validate_offset_opts(opts, :offset, %{max_page_size: max_page_size}) do
+  defp validate_offset_opts(opts, :offset, %{
+         max_page_size: max_page_size,
+         default_limit: default_limit
+       }) do
     limit =
       case opts |> Keyword.take([:limit]) |> Enum.into(%{}) do
         %{limit: limit} ->
           min(limit, max_page_size)
 
         _ ->
-          max_page_size
+          default_limit || max_page_size
       end
 
     {:ok, Keyword.put(opts, :limit, limit)}
@@ -1236,7 +1239,10 @@ defmodule AshGraphql.Graphql.Resolver do
     {:ok, opts}
   end
 
-  defp validate_keyset_opts(opts, strategy, %{max_page_size: max_page_size})
+  defp validate_keyset_opts(opts, strategy, %{
+         max_page_size: max_page_size,
+         default_limit: default_limit
+       })
        when strategy in [:keyset, :relay] do
     case opts |> Keyword.take([:first, :last, :after, :before]) |> Enum.into(%{}) do
       %{first: _first, last: _last} ->
@@ -1276,7 +1282,7 @@ defmodule AshGraphql.Graphql.Resolver do
          }}
 
       _ ->
-        {:ok, Keyword.put(opts, :limit, max_page_size)}
+        {:ok, Keyword.put(opts, :limit, default_limit || max_page_size)}
     end
   end
 

test/paginate_test.exs

@@ -72,6 +72,33 @@ defmodule AshGraphql.PaginateTest do
       assert is_binary(end_keyset)
     end
 
+    test "default_limit is used instead of max_page_size when first/last not provided" do
+      doc = """
+      query KeysetPaginatedPostsWithDefaultLimit {
+        keysetPaginatedPostsWithDefaultLimit(sort: [{field: TEXT, order: ASC_NULLS_LAST}]) {
+          count
+          results{
+            text
+          }
+        }
+      }
+      """
+
+      assert {:ok,
+              %{
+                data: %{
+                  "keysetPaginatedPostsWithDefaultLimit" => %{
+                    "count" => 5,
+                    "results" => results
+                  }
+                }
+              }} = Absinthe.run(doc, AshGraphql.Test.Schema)
+
+      # default_limit is 2, max_page_size is 5
+      # Without first/last, should use default_limit (2), not max_page_size (5)
+      assert length(results) == 2
+    end
+
     test "works if action has both offset and keyset pagination" do
       doc = """
       query OtherKeysetPaginatedPosts {

test/support/resources/post.ex

@@ -206,6 +206,7 @@ defmodule AshGraphql.Test.Post do
       list :paginated_posts, :paginated
       list :keyset_paginated_posts, :keyset_paginated
       list :other_keyset_paginated_posts, :keyset_and_offset_paginated, paginate_with: :keyset
+      list :keyset_paginated_posts_with_default_limit, :keyset_paginated_with_default_limit
       list :paginated_posts_without_limit, :paginated_without_limit
       list :paginated_posts_limit_not_required, :paginated_limit_not_required
       list :read_post_with_invalid_arguments_names, :read_with_invalid_arguments_names
@@ -420,6 +421,16 @@ defmodule AshGraphql.Test.Post do
       )
     end
 
+    read :keyset_paginated_with_default_limit do
+      pagination(
+        required?: true,
+        keyset?: true,
+        countable: true,
+        default_limit: 2,
+        max_page_size: 5
+      )
+    end
+
     read :keyset_and_offset_paginated do
       pagination(
         required?: true,