Skip to content

Commit a280c1a

Browse files
begedinjoshsmith
authored andcommitted
Removed unused code from Messages.list
1 parent 1eaba7a commit a280c1a

File tree

3 files changed

+1
-98
lines changed

3 files changed

+1
-98
lines changed

lib/code_corps/messages/messages.ex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ defmodule CodeCorps.Messages do
2020
def list(scope, %{} = params) do
2121
scope
2222
|> Query.id_filter(params)
23-
|> Messages.Query.author_filter(params)
24-
|> Messages.Query.project_filter(params)
2523
|> Repo.all()
2624
end
2725

lib/code_corps/messages/query.ex

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/lib/code_corps/messages/messages_test.exs

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,6 @@ defmodule CodeCorps.MessagesTest do
2020
assert Message |> Messages.list(%{}) |> Enum.count == 3
2121
end
2222

23-
test "can filter by project" do
24-
[project_1, project_2] = insert_pair(:project)
25-
messages_from_project_1 = insert_pair(:message, project: project_1)
26-
message_from_project_2 = insert(:message, project: project_2)
27-
28-
results = Message |> Messages.list(%{"project_id" => project_1.id})
29-
assert results |> Enum.count == 2
30-
assert results |> get_and_sort_ids() ==
31-
messages_from_project_1 |> get_and_sort_ids()
32-
33-
results = Message |> Messages.list(%{"project_id" => project_2.id})
34-
assert results |> Enum.count == 1
35-
assert results |> get_and_sort_ids() ==
36-
[message_from_project_2.id]
37-
end
38-
39-
test "can filter by author" do
40-
[author_1, author_2] = insert_pair(:user)
41-
messages_from_author_1 = insert_pair(:message, author: author_1)
42-
message_from_author_2 = insert(:message, author: author_2)
43-
44-
results = Message |> Messages.list(%{"author_id" => author_1.id})
45-
assert results |> Enum.count == 2
46-
assert results |> get_and_sort_ids() ==
47-
messages_from_author_1 |> get_and_sort_ids()
48-
49-
results = Message |> Messages.list(%{"author_id" => author_2.id})
50-
assert results |> Enum.count == 1
51-
assert results |> get_and_sort_ids() ==
52-
[message_from_author_2.id]
53-
end
54-
5523
test "can filter by list of ids" do
5624
[message_1, message_2, message_3] = insert_list(3, :message)
5725

@@ -68,40 +36,6 @@ defmodule CodeCorps.MessagesTest do
6836
[message_2] |> get_and_sort_ids()
6937
end
7038

71-
test "can apply multiple filters at once" do
72-
[project_1, project_2] = insert_pair(:project)
73-
[author_1, author_2] = insert_pair(:user)
74-
75-
message_p1_a1 = insert(:message, project: project_1, author: author_1)
76-
message_p1_a2 = insert(:message, project: project_1, author: author_2)
77-
message_p2_a1 = insert(:message, project: project_2, author: author_1)
78-
message_p2_a2 = insert(:message, project: project_2, author: author_2)
79-
80-
params = %{"project_id" => project_1.id, "author_id" => author_1.id}
81-
results = Message |> Messages.list(params)
82-
assert results |> get_and_sort_ids() == [message_p1_a1.id]
83-
84-
params = %{"project_id" => project_1.id, "author_id" => author_2.id}
85-
results = Message |> Messages.list(params)
86-
assert results |> get_and_sort_ids() == [message_p1_a2.id]
87-
88-
params = %{"project_id" => project_2.id, "author_id" => author_1.id}
89-
results = Message |> Messages.list(params)
90-
assert results |> get_and_sort_ids() == [message_p2_a1.id]
91-
92-
params = %{"project_id" => project_2.id, "author_id" => author_2.id}
93-
results = Message |> Messages.list(params)
94-
assert results |> get_and_sort_ids() == [message_p2_a2.id]
95-
96-
params = %{
97-
"filter" => %{"id" => "#{message_p1_a1.id},#{message_p2_a1.id}"},
98-
"project_id" => project_1.id
99-
}
100-
results = Message |> Messages.list(params)
101-
102-
assert results |> get_and_sort_ids() == [message_p1_a1.id]
103-
end
104-
10539
test "builds upon the provided scope" do
10640
[%{id: project_1_id} = project_1, project_2] = insert_pair(:project)
10741
[author_1, author_2] = insert_pair(:user)
@@ -111,7 +45,7 @@ defmodule CodeCorps.MessagesTest do
11145
message_p2_a1 = insert(:message, project: project_2, author: author_1)
11246
message_p2_a2 = insert(:message, project: project_2, author: author_2)
11347

114-
params = %{"author_id" => author_1.id}
48+
params = %{"filter" => %{"id" => "#{message_p1_a1.id}"}}
11549
result_ids =
11650
Message
11751
|> where(project_id: ^project_1_id)

0 commit comments

Comments
 (0)