refactor search saving logic #50

lib/proptrackr_web/controllers/search_controller.ex

@@ -55,43 +55,47 @@ defmodule PropTrackrWeb.SearchController do
     end
   end
 
-  def create(conn, %{ "search" => search }) do
-    current_user = conn.assigns.current_user
-
-    if current_user do
-      changeset = Search.changeset(%Search{}, search)
-      query = Search.create_query(changeset.changes, current_user)
-
-      saved = if current_user do
-        searches = Repo.all(
-          from s in Search,
-          where: s.user_id == ^current_user.id,
-          order_by: [asc: s.inserted_at]
-        )
-
-        if length(searches) >= 5 do
-          case Repo.delete(Enum.at(searches, 0)) do
-            {:ok, _search} -> :ok
-            {:error, _changeset} -> :error
-          end
-        end
-
-        search_assoc = Ecto.build_assoc(current_user, :searches, changeset.changes)
-        search_changeset = Search.changeset(search_assoc, changeset.changes)
+  defp save_search(conn, changeset, current_user) do
+    saved = if current_user do
+      searches = Repo.all(
+        from s in Search,
+        where: s.user_id == ^current_user.id,
+        order_by: [asc: s.inserted_at]
+      )
 
-        case Repo.insert(search_changeset) do
+      if length(searches) >= 5 do
+        case Repo.delete(Enum.at(searches, 0)) do
           {:ok, _search} -> :ok
           {:error, _changeset} -> :error
         end
-      else
-        :ok
       end
 
-      conn = case saved do
-        :ok -> conn
-        :error -> conn
-          |> put_flash(:error, "Unknown error saving search")
+      search_assoc = Ecto.build_assoc(current_user, :searches, changeset.changes)
+      search_changeset = Search.changeset(search_assoc, changeset.changes)
+
+      case Repo.insert(search_changeset) do
+        {:ok, _search} -> :ok
+        {:error, _changeset} -> :error
       end
+    else
+      :ok
+    end
+
+    case saved do
+      :ok -> conn
+      :error -> conn
+        |> put_flash(:error, "Unknown error saving search")
+    end
+  end
+
+  def create(conn, %{ "search" => search }) do
+    current_user = conn.assigns.current_user
+
+    if current_user do
+      changeset = Search.changeset(%Search{}, search)
+      query = Search.create_query(changeset.changes, current_user)
+
+      conn = conn |> save_search(changeset, current_user)
 
       properties = query |> Repo.all()