aaron_nad/cannery
1
0
Fork 0
forked from shibao/cannery
Code Pull Requests Activity

improve Ammo.list_packs

Browse Source
This commit is contained in:
shibao
2023-06-04 00:00:51 -04:00
parent 71fdd42d96
commit e80c2018be
20 changed files with 184 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

308
lib/cannery/ammo.ex
View File

@ -373,107 +373,144 @@ defmodule Cannery.Ammo do
type
end
# Packs
@type list_packs_option ::
{:type_id, Type.id()}
| {:container_id, Container.id()}
| {:class, Type.class() | :all}
| {:show_used, boolean() | nil}
| {:search, String.t() | nil}
| {:staged, boolean() | nil}
@type list_packs_options :: [list_packs_option()]
@doc """
Returns the list of packs for a user and type.
## Examples
iex> list_packs_for_type(
...> %Type{id: 123, user_id: 456},
...> %User{id: 456}
...> )
iex> list_packs(%User{id: 456})
[%Pack{}, ...]
iex> list_packs_for_type(
...> %Type{id: 123, user_id: 456},
iex> list_packs(
...> %User{id: 456},
...> true
...> show_used: true,
...> type_id: 123,
...> container_id: 789,
...> search: "something",
...> staged: true
...> )
[%Pack{}, %Pack{}, ...]
"""
@spec list_packs_for_type(Type.t(), User.t()) :: [Pack.t()]
@spec list_packs_for_type(Type.t(), User.t(), show_used :: boolean()) ::
[Pack.t()]
def list_packs_for_type(type, user, show_used \\ false)
def list_packs_for_type(
%Type{id: type_id, user_id: user_id},
%User{id: user_id},
show_used
) do
from(p in Pack,
as: :p,
where: p.type_id == ^type_id,
where: p.user_id == ^user_id,
preload: ^@pack_preloads
)
|> list_packs_for_type_show_used(show_used)
|> Repo.all()
end
@spec list_packs_for_type_show_used(Queryable.t(), show_used :: boolean()) ::
Queryable.t()
def list_packs_for_type_show_used(query, false),
do: query |> where([p: p], p.count > 0)
def list_packs_for_type_show_used(query, _true), do: query
@doc """
Returns the list of packs for a user and container.
## Examples
iex> list_packs_for_container(
...> %Container{id: 123, user_id: 456},
...> :rifle,
...> %User{id: 456}
...> )
[%Pack{}, ...]
iex> list_packs_for_container(
...> %Container{id: 123, user_id: 456},
...> :all,
...> %User{id: 456}
...> )
[%Pack{}, %Pack{}, ...]
"""
@spec list_packs_for_container(
Container.t(),
Type.t() | :all,
User.t()
) :: [Pack.t()]
def list_packs_for_container(
%Container{id: container_id, user_id: user_id},
type,
%User{id: user_id}
) do
@spec list_packs(User.t()) :: [Pack.t()]
@spec list_packs(User.t(), list_packs_options()) :: [Pack.t()]
def list_packs(%User{id: user_id}, opts \\ []) do
from(p in Pack,
as: :p,
join: t in assoc(p, :type),
on: p.user_id == t.user_id,
as: :t,
where: p.container_id == ^container_id,
join: c in Container,
on: p.container_id == c.id,
on: p.user_id == c.user_id,
as: :c,
where: p.user_id == c.user_id,
left_join: ct in ContainerTag,
on: c.id == ct.container_id,
left_join: tag in Tag,
on: ct.tag_id == tag.id,
on: p.user_id == tag.user_id,
as: :tag,
where: p.user_id == ^user_id,
where: p.count > 0,
distinct: p.id,
preload: ^@pack_preloads
)
|> list_packs_for_container_filter_type(type)
|> list_packs_search(Keyword.get(opts, :search))
|> list_packs_class(Keyword.get(opts, :class, :all))
|> list_packs_show_used(Keyword.get(opts, :show_used))
|> list_packs_staged(Keyword.get(opts, :staged))
|> list_packs_container_id(Keyword.get(opts, :container_id))
|> list_packs_type_id(Keyword.get(opts, :type_id))
|> Repo.all()
end
@spec list_packs_for_container_filter_type(Queryable.t(), Type.class() | :all) ::
Queryable.t()
defp list_packs_for_container_filter_type(query, :rifle),
@spec list_packs_search(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
defp list_packs_search(query, search) when search in ["", nil], do: query
defp list_packs_search(query, search) when search |> is_binary() do
trimmed_search = String.trim(search)
query
|> where(
[p: p, t: t, c: c, tag: tag],
fragment(
"? @@ websearch_to_tsquery('english', ?)",
p.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
t.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
c.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
tag.search,
^trimmed_search
)
)
|> order_by(
[p: p],
desc:
fragment(
"ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
p.search,
^trimmed_search
)
)
end
@spec list_packs_class(Queryable.t(), Type.class() | :all) :: Queryable.t()
defp list_packs_class(query, :rifle),
do: query |> where([t: t], t.class == :rifle)
defp list_packs_for_container_filter_type(query, :pistol),
defp list_packs_class(query, :pistol),
do: query |> where([t: t], t.class == :pistol)
defp list_packs_for_container_filter_type(query, :shotgun),
defp list_packs_class(query, :shotgun),
do: query |> where([t: t], t.class == :shotgun)
defp list_packs_for_container_filter_type(query, _all), do: query
defp list_packs_class(query, _all), do: query
@spec list_packs_show_used(Queryable.t(), show_used :: boolean() | nil) :: Queryable.t()
defp list_packs_show_used(query, true), do: query
defp list_packs_show_used(query, _false),
do: query |> where([p: p], not (p.count == 0))
@spec list_packs_container_id(Queryable.t(), Container.id() | nil) :: Queryable.t()
defp list_packs_container_id(query, container_id) when container_id |> is_binary(),
do: query |> where([p: p], p.container_id == ^container_id)
defp list_packs_container_id(query, _nil), do: query
@spec list_packs_type_id(Queryable.t(), Type.id() | nil) :: Queryable.t()
defp list_packs_type_id(query, type_id) when type_id |> is_binary(),
do: query |> where([p: p], p.type_id == ^type_id)
defp list_packs_type_id(query, _nil), do: query
@spec list_packs_staged(Queryable.t(), staged :: boolean() | nil) :: Queryable.t()
defp list_packs_staged(query, staged) when staged |> is_boolean(),
do: query |> where([p: p], p.staged == ^staged)
defp list_packs_staged(query, _nil), do: query
@doc """
Returns a count of packs.
@ -734,131 +771,6 @@ defmodule Cannery.Ammo do
|> Map.new()
end
@doc """
Returns the list of packs.
## Examples
iex> list_packs(%User{id: 123})
[%Pack{}, ...]
iex> list_packs("cool", %User{id: 123}, true)
[%Pack{notes: "My cool pack"}, ...]
"""
@spec list_packs(search :: String.t() | nil, Type.class() | :all, User.t()) ::
[Pack.t()]
@spec list_packs(
search :: nil | String.t(),
Type.class() | :all,
User.t(),
show_used :: boolean()
) :: [Pack.t()]
def list_packs(search, class, %User{id: user_id}, show_used \\ false) do
from(p in Pack,
as: :p,
join: t in assoc(p, :type),
as: :t,
join: c in Container,
on: p.container_id == c.id,
on: p.user_id == c.user_id,
as: :c,
left_join: ct in ContainerTag,
on: c.id == ct.container_id,
left_join: tag in Tag,
on: ct.tag_id == tag.id,
on: c.user_id == tag.user_id,
as: :tag,
where: p.user_id == ^user_id,
distinct: p.id,
preload: ^@pack_preloads
)
|> list_packs_class(class)
|> list_packs_show_used(show_used)
|> list_packs_search(search)
|> Repo.all()
end
@spec list_packs_class(Queryable.t(), Type.class() | :all) :: Queryable.t()
defp list_packs_class(query, :rifle),
do: query |> where([t: t], t.class == :rifle)
defp list_packs_class(query, :pistol),
do: query |> where([t: t], t.class == :pistol)
defp list_packs_class(query, :shotgun),
do: query |> where([t: t], t.class == :shotgun)
defp list_packs_class(query, _all), do: query
@spec list_packs_show_used(Queryable.t(), show_used :: boolean()) :: Queryable.t()
defp list_packs_show_used(query, true), do: query
defp list_packs_show_used(query, _false) do
query |> where([p: p], not (p.count == 0))
end
@spec list_packs_show_used(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
defp list_packs_search(query, nil), do: query
defp list_packs_search(query, ""), do: query
defp list_packs_search(query, search) do
trimmed_search = String.trim(search)
query
|> where(
[p: p, t: t, c: c, tag: tag],
fragment(
"? @@ websearch_to_tsquery('english', ?)",
p.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
t.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
c.search,
^trimmed_search
) or
fragment(
"? @@ websearch_to_tsquery('english', ?)",
tag.search,
^trimmed_search
)
)
|> order_by(
[p: p],
desc:
fragment(
"ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
p.search,
^trimmed_search
)
)
end
@doc """
Returns the list of staged packs for a user.
## Examples
iex> list_staged_packs(%User{id: 123})
[%Pack{}, ...]
"""
@spec list_staged_packs(User.t()) :: [Pack.t()]
def list_staged_packs(%User{id: user_id}) do
Repo.all(
from p in Pack,
where: p.user_id == ^user_id,
where: p.staged == true,
preload: ^@pack_preloads
)
end
@doc """
Gets a single pack.

2
lib/cannery_web/controllers/export_controller.ex
View File

@ -27,7 +27,7 @@ defmodule CanneryWeb.ExportController do
})
end)
packs = Ammo.list_packs(nil, :all, current_user, true)
packs = Ammo.list_packs(current_user, show_used: true)
used_counts = packs |> ActivityLog.get_used_counts(current_user)
original_counts = packs |> Ammo.get_original_counts(current_user)
cprs = packs |> Ammo.get_cprs(current_user)

6
lib/cannery_web/live/container_live/show.ex
View File

@ -104,8 +104,10 @@ defmodule CanneryWeb.ContainerLive.Show do
id,
current_user
) do
%{name: container_name} = container = Containers.get_container!(id, current_user)
packs = Ammo.list_packs_for_container(container, class, current_user)
%{id: container_id, name: container_name} =
container = Containers.get_container!(id, current_user)
packs = Ammo.list_packs(current_user, container_id: container_id, class: class)
original_counts = packs |> Ammo.get_original_counts(current_user)
cprs = packs |> Ammo.get_cprs(current_user)
last_used_dates = packs |> ActivityLog.get_last_used_dates(current_user)

2
lib/cannery_web/live/pack_live/index.ex
View File

@ -149,7 +149,7 @@ defmodule CanneryWeb.PackLive.Index do
# get total number of packs to determine whether to display onboarding
# prompts
packs_count = Ammo.get_packs_count!(current_user, true)
packs = Ammo.list_packs(search, class, current_user, show_used)
packs = Ammo.list_packs(current_user, search: search, class: class, show_used: show_used)
types_count = Ammo.get_types_count!(current_user)
containers_count = Containers.get_containers_count!(current_user)

2
lib/cannery_web/live/range_live/index.ex
View File

@ -121,7 +121,7 @@ defmodule CanneryWeb.RangeLive.Index do
%{assigns: %{class: class, search: search, current_user: current_user}} = socket
) do
shot_records = ActivityLog.list_shot_records(search, class, current_user)
packs = Ammo.list_staged_packs(current_user)
packs = Ammo.list_packs(current_user, staged: true)
chart_data = shot_records |> get_chart_data_for_shot_record()
original_counts = packs |> Ammo.get_original_counts(current_user)
cprs = packs |> Ammo.get_cprs(current_user)

4
lib/cannery_web/live/type_live/show.ex
View File

@ -40,7 +40,7 @@ defmodule CanneryWeb.TypeLive.Show do
defp display_type(
%{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
socket,
%Type{name: type_name} = type
%Type{id: type_id, name: type_name} = type
) do
custom_fields? =
fields_to_display(type)
@ -54,7 +54,7 @@ defmodule CanneryWeb.TypeLive.Show do
type |> Map.get(field) != default_value
end)
packs = type |> Ammo.list_packs_for_type(current_user, show_used)
packs = Ammo.list_packs(current_user, type_id: type_id, show_used: show_used)
[
original_counts,