Removed unused code from Messages.list

code-corps · Dec 20, 2017 · a280c1a · a280c1a
1 parent 1eaba7a
commit a280c1a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 98 deletions.
diff --git a/lib/code_corps/messages/messages.ex b/lib/code_corps/messages/messages.ex
@@ -20,8 +20,6 @@ defmodule CodeCorps.Messages do
   def list(scope, %{} = params) do
     scope
     |> Query.id_filter(params)
-    |> Messages.Query.author_filter(params)
-    |> Messages.Query.project_filter(params)
     |> Repo.all()
   end
 

diff --git a/lib/code_corps/messages/query.ex b/lib/code_corps/messages/query.ex
diff --git a/test/lib/code_corps/messages/messages_test.exs b/test/lib/code_corps/messages/messages_test.exs
@@ -20,38 +20,6 @@ defmodule CodeCorps.MessagesTest do
       assert Message |> Messages.list(%{}) |> Enum.count == 3
     end
 
-    test "can filter by project" do
-      [project_1, project_2] = insert_pair(:project)
-      messages_from_project_1 = insert_pair(:message, project: project_1)
-      message_from_project_2 = insert(:message, project: project_2)
-
-      results = Message |> Messages.list(%{"project_id" => project_1.id})
-      assert results |> Enum.count == 2
-      assert results |> get_and_sort_ids() ==
-        messages_from_project_1 |> get_and_sort_ids()
-
-      results = Message |> Messages.list(%{"project_id" => project_2.id})
-      assert results |> Enum.count == 1
-      assert results |> get_and_sort_ids() ==
-        [message_from_project_2.id]
-    end
-
-    test "can filter by author" do
-      [author_1, author_2] = insert_pair(:user)
-      messages_from_author_1 = insert_pair(:message, author: author_1)
-      message_from_author_2 = insert(:message, author: author_2)
-
-      results = Message |> Messages.list(%{"author_id" => author_1.id})
-      assert results |> Enum.count == 2
-      assert results |> get_and_sort_ids() ==
-        messages_from_author_1 |> get_and_sort_ids()
-
-      results = Message |> Messages.list(%{"author_id" => author_2.id})
-      assert results |> Enum.count == 1
-      assert results |> get_and_sort_ids() ==
-        [message_from_author_2.id]
-    end
-
     test "can filter by list of ids" do
       [message_1, message_2, message_3] = insert_list(3, :message)
 
@@ -68,40 +36,6 @@ defmodule CodeCorps.MessagesTest do
         [message_2] |> get_and_sort_ids()
     end
 
-    test "can apply multiple filters at once" do
-      [project_1, project_2] = insert_pair(:project)
-      [author_1, author_2] = insert_pair(:user)
-
-      message_p1_a1 = insert(:message, project: project_1, author: author_1)
-      message_p1_a2 = insert(:message, project: project_1, author: author_2)
-      message_p2_a1 = insert(:message, project: project_2, author: author_1)
-      message_p2_a2 = insert(:message, project: project_2, author: author_2)
-
-      params = %{"project_id" => project_1.id, "author_id" => author_1.id}
-      results = Message |> Messages.list(params)
-      assert results |> get_and_sort_ids() == [message_p1_a1.id]
-
-      params = %{"project_id" => project_1.id, "author_id" => author_2.id}
-      results = Message |> Messages.list(params)
-      assert results |> get_and_sort_ids() == [message_p1_a2.id]
-
-      params = %{"project_id" => project_2.id, "author_id" => author_1.id}
-      results = Message |> Messages.list(params)
-      assert results |> get_and_sort_ids() == [message_p2_a1.id]
-
-      params = %{"project_id" => project_2.id, "author_id" => author_2.id}
-      results = Message |> Messages.list(params)
-      assert results |> get_and_sort_ids() == [message_p2_a2.id]
-
-      params = %{
-        "filter" => %{"id" => "#{message_p1_a1.id},#{message_p2_a1.id}"},
-        "project_id" => project_1.id
-      }
-      results = Message |> Messages.list(params)
-
-      assert results |> get_and_sort_ids() == [message_p1_a1.id]
-    end
-
     test "builds upon the provided scope" do
       [%{id: project_1_id} = project_1, project_2] = insert_pair(:project)
       [author_1, author_2] = insert_pair(:user)
@@ -111,7 +45,7 @@ defmodule CodeCorps.MessagesTest do
       message_p2_a1 = insert(:message, project: project_2, author: author_1)
       message_p2_a2 = insert(:message, project: project_2, author: author_2)
 
-      params = %{"author_id" => author_1.id}
+      params = %{"filter" => %{"id" => "#{message_p1_a1.id}"}}
       result_ids =
         Message
         |> where(project_id: ^project_1_id)