Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add user filter by first, last, username #698

Merged
merged 1 commit into from
Feb 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lib/code_corps/helpers/query.ex
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ defmodule CodeCorps.Helpers.Query do

# end comment queries

# user queries

def user_filter(query, %{"query" => query_string}) do
query
|> where(
[object],
ilike(object.first_name, ^"%#{query_string}%") or
ilike(object.last_name, ^"%#{query_string}%") or
ilike(object.username, ^"%#{query_string}%")
)
end
def user_filter(query, _), do: query

# end user queries

# sorting

def sort_by_newest_first(query), do: query |> order_by([desc: :inserted_at])
Expand Down
26 changes: 26 additions & 0 deletions test/controllers/user_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,32 @@ defmodule CodeCorps.UserControllerTest do
|> json_response(200)
|> assert_ids_from_response([user_1.id, user_2.id])
end

test "returns search results on index", %{conn: conn} do
user_1 = insert(:user, first_name: "Joe")
user_2 = insert(:user, username: "joecoder")
user_3 = insert(:user, last_name: "Jacko")
insert(:user, first_name: "Max")

params = %{"query" => "j"}
path = conn |> user_path(:index, params)

conn
|> get(path)
|> json_response(200)
|> assert_ids_from_response([user_1.id, user_2.id, user_3.id])
end

test "limit filter limits results on index", %{conn: conn} do
insert_list(6, :user)

params = %{"limit" => 5}
path = conn |> user_path(:index, params)
json = conn |> get(path) |> json_response(200)

returned_users_length = json["data"] |> length
assert returned_users_length == 5
end
end

describe "show" do
Expand Down
8 changes: 7 additions & 1 deletion web/controllers/user_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ defmodule CodeCorps.UserController do
use CodeCorps.Web, :controller
use JaResource

import CodeCorps.Helpers.Query, only: [id_filter: 2]
import CodeCorps.Helpers.Query, only: [id_filter: 2, user_filter: 2, limit_filter: 2]

alias CodeCorps.User
alias CodeCorps.Services.UserService
Expand All @@ -15,6 +15,12 @@ defmodule CodeCorps.UserController do
query |> id_filter(id_list)
end

def handle_index(_conn, params) do
User
|> user_filter(params)
|> limit_filter(params)
end

def handle_create(_conn, attributes) do
%User{} |> User.registration_changeset(attributes)
end
Expand Down