Add ability to search to organizations, projects

knewter · Nov 1, 2016 · bd2d268 · bd2d268
1 parent 05f62bb
commit bd2d268
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/time_tracker_backend/test/controllers/organization_controller_test.exs b/time_tracker_backend/test/controllers/organization_controller_test.exs
@@ -24,6 +24,14 @@ defmodule TimeTrackerBackend.OrganizationControllerTest do
     assert length(response) == 10
   end
 
+  test "searches entries on index with query", %{conn: conn} do
+    insert_list(12, :organization)
+    insert(:organization, %{name: "jabbity"})
+    conn = get conn, organization_path(conn, :index, %{q: "jabbit"})
+    response = json_response(conn, 200)["data"]
+    assert (hd response)["name"] == "jabbity"
+  end
+
   test "shows chosen resource", %{conn: conn} do
     organization = Repo.insert! %Organization{}
     conn = get conn, organization_path(conn, :show, organization)

diff --git a/time_tracker_backend/test/controllers/project_controller_test.exs b/time_tracker_backend/test/controllers/project_controller_test.exs
@@ -24,6 +24,14 @@ defmodule TimeTrackerBackend.ProjectControllerTest do
     assert length(response) == 10
   end
 
+  test "searches entries on index with query", %{conn: conn} do
+    insert_list(12, :project)
+    insert(:project, %{name: "jabbity"})
+    conn = get conn, project_path(conn, :index, %{q: "jabbit"})
+    response = json_response(conn, 200)["data"]
+    assert (hd response)["name"] == "jabbity"
+  end
+
   test "shows chosen resource", %{conn: conn} do
     project = Repo.insert! %Project{}
     conn = get conn, project_path(conn, :show, project)

diff --git a/time_tracker_backend/web/controllers/organization_controller.ex b/time_tracker_backend/web/controllers/organization_controller.ex
@@ -3,9 +3,16 @@ defmodule TimeTrackerBackend.OrganizationController do
 
   alias TimeTrackerBackend.Organization
 
+  defp search(query, %{ "q" => q }) do
+    from u in query,
+      where: ilike(u.name, ^"%#{q}%")
+  end
+  defp search(query, _), do: query
+
   def index(conn, params) do
     page =
       Organization
+      |> search(params)
       |> Repo.paginate(params)
 
     conn

diff --git a/time_tracker_backend/web/controllers/project_controller.ex b/time_tracker_backend/web/controllers/project_controller.ex
@@ -1,9 +1,16 @@
 defmodule TimeTrackerBackend.ProjectController do
   use TimeTrackerBackend.Web, :controller
 
+  defp search(query, %{ "q" => q }) do
+    from u in query,
+      where: ilike(u.name, ^"%#{q}%")
+  end
+  defp search(query, _), do: query
+
   def index(conn, params) do
     page =
       Project
+      |> search(params)
       |> Repo.paginate(params)
 
     conn