Make Sites.list_guests_query ordering deterministic to avoid flaky tests (#6132)

* Make `Sites.list_guests_query` ordering deterministic to avoid flaky tests

* Fix pagination opts

Author: zoldar

extra/lib/plausible_web/controllers/api/external_sites_controller.ex

@@ -35,7 +35,7 @@ defmodule PlausibleWeb.Api.ExternalSitesController do
 
     with {:ok, site_id} <- expect_param_key(params, "site_id"),
          {:ok, site} <- find_site(user, team, site_id, [:owner, :admin, :editor, :viewer]) do
-      opts = [cursor_fields: [inserted_at: :desc, id: :desc], limit: 100, maximum_limit: 1000]
+      opts = [cursor_fields: [sort_index: :asc], limit: 100, maximum_limit: 1000]
       page = site |> Sites.list_guests_query() |> paginate(params, opts)
 
       json(conn, %{

lib/plausible/sites.ex

@@ -204,6 +204,7 @@ defmodule Plausible.Sites do
         where: gm.site_id == ^site.id,
         select: %{
           id: gm.id,
+          sort_index: -gm.id,
           inserted_at: gm.inserted_at,
           email: u.email,
           role: gm.role,
@@ -226,6 +227,7 @@ defmodule Plausible.Sites do
         where: gi.site_id == ^site.id,
         select: %{
           id: gi.id,
+          sort_index: gi.id,
           inserted_at: gi.inserted_at,
           email: ti.email,
           role: gi.role,
@@ -245,12 +247,13 @@ defmodule Plausible.Sites do
     from(g in subquery(guests),
       select: %{
         id: g.id,
+        sort_index: g.sort_index,
         inserted_at: g.inserted_at,
         email: g.email,
         role: g.role,
         status: g.status
       },
-      order_by: [desc: g.inserted_at, desc: g.id]
+      order_by: [asc: g.sort_index]
     )
   end