fix: restructure dex contracts swaps pagination cursor (#2045)

lib/ae_mdw/dex.ex

@@ -238,12 +238,6 @@ defmodule AeMdw.Dex do
     fn direction ->
       create_txis
       |> Enum.map(fn create_txi ->
-        cursor =
-          case cursor do
-            {account_pk, txi, log_idx} -> {create_txi, account_pk, txi, log_idx}
-            nil -> nil
-          end
-
         key_boundary =
           Collection.generate_key_boundary(
             {create_txi, Collection.binary(), Collection.integer(), Collection.integer()}
@@ -293,7 +287,7 @@ defmodule AeMdw.Dex do
          {create_txi, <<_pk::256>> = account_pk, txi, log_idx}
          when is_integer(create_txi) and is_integer(txi) and is_integer(log_idx) <-
            :erlang.binary_to_term(cursor_bin) do
-      {:ok, {account_pk, txi, log_idx}}
+      {:ok, {create_txi, account_pk, txi, log_idx}}
     else
       _invalid_cursor ->
         {:error, ErrInput.Cursor.exception(value: cursor_hex)}

test/integration/ae_mdw_web/controllers/dex_controller_test.exs

@@ -2,6 +2,7 @@ defmodule Integration.AeMdwWeb.DexControllerTest do
   use AeMdwWeb.ConnCase, async: false
 
   alias AeMdw.Db.Model
+  alias AeMdw.IntegrationUtil
 
   require Model
 
@@ -47,5 +48,39 @@ defmodule Integration.AeMdwWeb.DexControllerTest do
 
       assert %{"data" => ^dex_swaps} = conn |> get(prev_dex_swaps) |> json_response(200)
     end
+
+    test "it paginates", %{conn: conn} do
+      IntegrationUtil.test_pagination(conn, %IntegrationUtil.PaginationParams{
+        url: "/v3/debug/dex/#{@ae_token_id}/swaps"
+      })
+    end
+  end
+
+  describe "swaps endpoint for contract" do
+    test "it paginates", %{conn: conn} do
+      pubkey = "ct_2U1usf3A8ZNUcZLkZe5rEoBTxk7eJvk9fcbRDNqmRiwXCHAYN"
+
+      IntegrationUtil.test_pagination(conn, %IntegrationUtil.PaginationParams{
+        url: "/v3/dex/#{pubkey}/swaps"
+      })
+    end
+  end
+
+  describe "swaps endpoint" do
+    test "it paginates", %{conn: conn} do
+      IntegrationUtil.test_pagination(conn, %IntegrationUtil.PaginationParams{
+        url: "/v3/dex/swaps"
+      })
+    end
+  end
+
+  describe "swaps accounts endpoint" do
+    test "it paginates", %{conn: conn} do
+      account = "ak_azbNZ1XrPjXfqBqbAh1ffLNTQ1sbnuUDFvJrXjYz7JQA1saQ3"
+
+      IntegrationUtil.test_pagination(conn, %IntegrationUtil.PaginationParams{
+        url: "/v3/accounts/#{account}/dex/swaps"
+      })
+    end
   end
 end

test/support/integration_util.ex

@@ -4,9 +4,16 @@ defmodule AeMdw.IntegrationUtil do
   """
 
   import Phoenix.ConnTest
+  import ExUnit.Assertions
 
   @endpoint AeMdwWeb.Endpoint
 
+  defmodule PaginationParams do
+    @moduledoc false
+    @enforce_keys [:url]
+    defstruct [:url, params: [], entries_range: 1..10]
+  end
+
   @spec scan(any(), Conn.t(), any(), (any(), any() -> any())) :: any()
   def scan(%{"next" => nil, "data" => data}, _conn, accumulator, f) do
     f.(data, accumulator)
@@ -22,4 +29,36 @@ defmodule AeMdw.IntegrationUtil do
     |> json_response(200)
     |> scan(conn, new_acc, f)
   end
+
+  @spec test_pagination(Conn.t(), PaginationParams.t()) :: any()
+  def test_pagination(conn, %PaginationParams{
+        url: url,
+        params: params,
+        entries_range: entries_range
+      }) do
+    for limit <- entries_range do
+      %{"data" => initial_data, "next" => next} =
+        conn
+        |> get(url, params ++ [{:limit, limit}])
+        |> json_response(200)
+
+      %URI{path: path, query: query} = URI.parse(next)
+
+      %{"prev" => prev, "data" => next_data} =
+        conn
+        |> get(path <> "?" <> query)
+        |> json_response(200)
+
+      refute initial_data == next_data
+
+      %URI{path: path, query: query} = URI.parse(prev)
+
+      %{"data" => prev_data} =
+        conn
+        |> get(path <> "?" <> query)
+        |> json_response(200)
+
+      assert initial_data == prev_data
+    end
+  end
 end