Merge pull request #42 from eduardoscottini/improve-order-by

Add map case to order by
jungsoft · Sep 14, 2020 · f3d3203 · f3d3203
2 parents 6575703 + f16d4f2
commit f3d3203
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/crudry_query.ex b/lib/crudry_query.ex
@@ -39,6 +39,7 @@ defmodule Crudry.Query do
       Crudry.Query.list(MySchema, %{order_by: ["age", "username"]})
       Crudry.Query.list(MySchema, %{order_by: [:age, :username]})
       Crudry.Query.list(MySchema, %{order_by: [asc: :age, desc: :username]})
+      Crudry.Query.list(MySchema, %{order_by: [%{field: "age", order: :asc}, %{field: "username", order: :desc}]})
       Crudry.Query.list(MySchema, custom_query: &MySchema.scope_list/1)
   """
   def list(initial_query, opts \\ []) do
@@ -121,6 +122,7 @@ defmodule Crudry.Query do
 
   defp parse_order_by_args(sorting_order, orders_by) when is_list(orders_by) do
     Enum.map(orders_by, fn
+      %{order: sort, field: order} -> {to_atom(sort), to_atom(order)}
       {sort, order} -> {to_atom(sort), to_atom(order)}
       order -> {to_atom(sorting_order), to_atom(order)}
     end)

diff --git a/test/crudry_query_test.exs b/test/crudry_query_test.exs
@@ -116,6 +116,18 @@ defmodule CrudryQueryTest do
       assert length(users) == 3
       assert Enum.map(users, & &1.username) == ["Chuck Norris", "Will Smith", "Zz"]
     end
+
+    test "works with list of maps in order by" do
+      pagination_params = %{order_by: [%{field: "age", order: :asc}, %{field: "username", order: :desc}]}
+
+      users =
+        User
+        |> Crudry.Query.list(pagination_params)
+        |> Repo.all()
+
+      assert length(users) == 3
+      assert Enum.map(users, & &1.username) == ["Will Smith", "Chuck Norris", "Zz"]
+    end
   end
 
   describe "combinate functions" do