Skip to content

Commit

Permalink
move grouping of detours into controller
Browse files Browse the repository at this point in the history
  • Loading branch information
bfauble committed Feb 18, 2025
1 parent afb008e commit 8040908
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 26 deletions.
25 changes: 0 additions & 25 deletions lib/skate/detours/detours.ex
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,6 @@ defmodule Skate.Detours.Detours do
|> Enum.map(&db_detour_to_detour/1)
end

@doc """
Returns the detours grouped by active, draft, and past.
## Examples
iex> grouped_detours(my_user_id)
%{
active: [%DetailedDetour{}, ...],
draft: nil,
past: [%DetailedDetour{}, ...]
}
"""
@spec grouped_detours(integer()) :: %{
active: list(DetailedDetour.t()) | nil,
draft: list(DetailedDetour.t()) | nil,
past: list(DetailedDetour.t()) | nil
}
def grouped_detours(user_id) do
%{
active: detours_for_user(user_id, :active),
draft: detours_for_user(user_id, :draft),
past: detours_for_user(user_id, :past)
}
end

def detours_for_user(user_id, status) do
Skate.Detours.Db.Detour.Queries.select_detour_list_info()
|> apply_user_and_status_filter(user_id, status)
Expand Down
6 changes: 5 additions & 1 deletion lib/skate_web/controllers/detours_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ defmodule SkateWeb.DetoursController do
def detours(conn, _params) do
%{id: user_id} = AuthManager.Plug.current_resource(conn)

detours = Detours.grouped_detours(user_id)
detours = %{
active: Detours.detours_for_user(user_id, :active),
draft: Detours.detours_for_user(user_id, :draft),
past: Detours.detours_for_user(user_id, :past)
}

json(conn, %{data: detours})
end
Expand Down

0 comments on commit 8040908

Please sign in to comment.